Skip to content

Commit 8ce9b72

Browse files
author
Thomasr
committed
Fix error while dsl == null
1 parent 3a4c70f commit 8ce9b72

File tree

1 file changed

+7
-6
lines changed
  • server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model

1 file changed

+7
-6
lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
import org.springframework.util.StringUtils;
2222

2323
import java.time.Instant;
24-
import java.util.Collections;
25-
import java.util.Map;
26-
import java.util.Optional;
27-
import java.util.Set;
24+
import java.util.*;
2825
import java.util.function.Supplier;
2926

3027
import static com.google.common.base.Suppliers.memoize;
@@ -155,7 +152,9 @@ public ApplicationQuery getQueryByViewModeAndQueryId(boolean isViewMode, String
155152
@Transient
156153
@JsonIgnore
157154
public Map<String, Object> getLiveApplicationDsl() {
158-
return MapUtils.isEmpty(publishedApplicationDSL) ? editingApplicationDSL : publishedApplicationDSL;
155+
var dsl = MapUtils.isEmpty(publishedApplicationDSL) ? editingApplicationDSL : publishedApplicationDSL;
156+
if (dsl == null) dsl = new HashMap<>();
157+
return dsl;
159158
}
160159

161160
public String getOrganizationId() {
@@ -175,7 +174,9 @@ public int getApplicationType() {
175174
}
176175

177176
public Map<String, Object> getEditingApplicationDSL() {
178-
return editingApplicationDSL;
177+
var dsl = editingApplicationDSL;
178+
if (dsl == null) dsl = new HashMap<>();
179+
return dsl;
179180
}
180181

181182
public Object getLiveContainerSize() {

0 commit comments

Comments
 (0)