npe fixes

# Conflicts: # gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
Evolveum · Mar 29, 2018 · e4b5a0f · e4b5a0f
1 parent a440995
commit e4b5a0f
Showing 1 changed file with 2 additions and 2 deletions.
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
@@ -508,7 +508,7 @@ public static String getTargetSearchExpPathValue(ExpressionType expression){
             return null;
         }
         PrimitiveXNode<ItemPathType> pathValue = (PrimitiveXNode<ItemPathType>)filterNodeMap.get(new QName("path"));
-        return pathValue != null ? pathValue.getValue().toString() : null;
+        return pathValue != null && pathValue.getValue() != null ? pathValue.getValue().toString() : null;
     }
 
     public static String getTargetSearchExpValue(ExpressionType expression){
@@ -532,7 +532,7 @@ public static String getTargetSearchExpValue(ExpressionType expression){
         if (valueNode.getValueParser() != null) {
             return valueNode.getValueParser().getStringValue();
         } else {
-            return valueNode.getValue().toString();
+            return valueNode.getValue() != null ? valueNode.getValue().toString() : null;
         }
 
     }