fix: add null check to Session userId before setting userId on MdxBase

meotchwilliams · meotch · commit e52d7ca7cf67 · 2024-04-08T10:50:53.000-06:00
diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/MdxBase.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/MdxBase.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.mx.path.core.common.lang.Strings;
 import com.mx.path.core.common.model.ModelBase;
 import com.mx.path.core.common.model.Warning;
 import com.mx.path.core.context.Session;
@@ -13,7 +14,7 @@ public abstract class MdxBase<T> extends ModelBase<T> {
   private List<Warning> warnings;
 
   public MdxBase() {
-    if (Session.current() != null) {
+    if (Session.current() != null && Strings.isNotBlank(Session.current().getUserId())) {
       this.setUserId(Session.current().getUserId());
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import java.util.ArrayList;`
`4`	`4`	`import java.util.List;`
`5`	`5`
	`6`	`+import com.mx.path.core.common.lang.Strings;`
`6`	`7`	`import com.mx.path.core.common.model.ModelBase;`
`7`	`8`	`import com.mx.path.core.common.model.Warning;`
`8`	`9`	`import com.mx.path.core.context.Session;`
`@@ -13,7 +14,7 @@ public abstract class MdxBase<T> extends ModelBase<T> {`
`13`	`14`	`private List<Warning> warnings;`
`14`	`15`
`15`	`16`	`public MdxBase() {`
`16`		`- if (Session.current() != null) {`
	`17`	`+ if (Session.current() != null && Strings.isNotBlank(Session.current().getUserId())) {`
`17`	`18`	`this.setUserId(Session.current().getUserId());`
`18`	`19`	`}`
`19`	`20`	`}`