From 5a796aeaa8644beaf40577413bfe3bb7b74527d4 Mon Sep 17 00:00:00 2001
From: kate <honchar@evolveum.com>
Date: Thu, 31 Jan 2019 11:11:08 +0100
Subject: [PATCH] fix for expression panel

---
 .../java/com/evolveum/midpoint/web/util/ExpressionUtil.java  | 5 ++++-
 1 file changed, 4 insertions(+), 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
index 41454075841..57d6638ac5d 100644
--- 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);
                     }
                 }