Commitdc87672

Thomasr

authored and

committed

Fix error while dsl == null

1 parente21c722 commitdc87672Copy full SHA for dc87672

File tree

-6

lines changed

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

-6

lines changed

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,7 @@`
`21`	`21`	`importorg.springframework.util.StringUtils;`
`22`	`22`
`23`	`23`	`importjava.time.Instant;`
`24`		`-importjava.util.Collections;`
`25`		`-importjava.util.Map;`
`26`		`-importjava.util.Optional;`
`27`		`-importjava.util.Set;`
	`24`	`+importjava.util.*;`
`28`	`25`	`importjava.util.function.Supplier;`
`29`	`26`
`30`	`27`	`importstaticcom.google.common.base.Suppliers.memoize;`
`@@ -155,7 +152,9 @@ public ApplicationQuery getQueryByViewModeAndQueryId(boolean isViewMode, String`
`155`	`152`	`@Transient`
`156`	`153`	`@JsonIgnore`
`157`	`154`	`publicMap<String,Object>getLiveApplicationDsl() {`
`158`		`-returnMapUtils.isEmpty(publishedApplicationDSL) ?editingApplicationDSL :publishedApplicationDSL;`
	`155`	`+vardsl =MapUtils.isEmpty(publishedApplicationDSL) ?editingApplicationDSL :publishedApplicationDSL;`
	`156`	`+if (dsl ==null)dsl =newHashMap<>();`
	`157`	`+returndsl;`
`159`	`158`	`}`
`160`	`159`
`161`	`160`	`publicStringgetOrganizationId() {`
`@@ -175,7 +174,9 @@ public int getApplicationType() {`
`175`	`174`	`}`
`176`	`175`
`177`	`176`	`publicMap<String,Object>getEditingApplicationDSL() {`
`178`		`-returneditingApplicationDSL;`
	`177`	`+vardsl =editingApplicationDSL;`
	`178`	`+if (dsl ==null)dsl =newHashMap<>();`
	`179`	`+returndsl;`
`179`	`180`	`}`
`180`	`181`
`181`	`182`	`publicObjectgetLiveContainerSize() {`

Comments

(0)