fix for expression panel

Evolveum · Jan 31, 2019 · 5a796ae · 5a796ae
1 parent e1770fd
commit 5a796ae
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
@@ -450,7 +450,7 @@ public static List<ObjectReferenceType> getShadowRefValue(ExpressionType express
         if (expressionType == null) {
             return null;
         }
-        List<ObjectReferenceType> shadowRefList = new ArrayList<>();
+        List<ObjectReferenceType> shadowRefList = null;
         ListXNode shadowRefNodes = getShadowRefNodesList(expressionType, false, prismContext);
 
         if (shadowRefNodes != null) {
@@ -463,6 +463,9 @@ public static List<ObjectReferenceType> getShadowRefValue(ExpressionType express
                                 (shadowOidNode != null && shadowOidNode.getValue() != null ? (String) shadowOidNode.getValue() : null);
                         shadowRef.setOid(oid);
                         shadowRef.setType(ShadowType.COMPLEX_TYPE);
+                        if (shadowRefList == null){
+                            shadowRefList =  new ArrayList<>();
+                        }
                         shadowRefList.add(shadowRef);
                     }
                 }