Fix error while dsl == null

lowcoder-org · Sep 16, 2024 · dc87672 · dc87672
1 parent e21c722
commit dc87672
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/...vice/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java b/...vice/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java
@@ -21,10 +21,7 @@
 import org.springframework.util.StringUtils;
 
 import java.time.Instant;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Supplier;
 
 import static com.google.common.base.Suppliers.memoize;
@@ -155,7 +152,9 @@ public ApplicationQuery getQueryByViewModeAndQueryId(boolean isViewMode, String
     @Transient
     @JsonIgnore
     public Map<String, Object> getLiveApplicationDsl() {
-        return MapUtils.isEmpty(publishedApplicationDSL) ? editingApplicationDSL : publishedApplicationDSL;
+        var dsl = MapUtils.isEmpty(publishedApplicationDSL) ? editingApplicationDSL : publishedApplicationDSL;
+        if (dsl == null) dsl = new HashMap<>();
+        return dsl;
     }
 
     public String getOrganizationId() {
@@ -175,7 +174,9 @@ public int getApplicationType() {
     }
 
     public Map<String, Object> getEditingApplicationDSL() {
-        return editingApplicationDSL;
+        var dsl = editingApplicationDSL;
+        if (dsl == null) dsl = new HashMap<>();
+        return dsl;
     }
 
     public Object getLiveContainerSize() {