Merge pull request #160 from cristal-ise/Issue159_NPE_in_JooqItemHand…

…ler_getItemPath #159 Fix NPE in JooqItemHandler.getItemPath
cristal-ise · Mar 22, 2019 · 9b61244 · 9b61244
2 parents aed27ae + dc86e46
commit 9b61244
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/jooqdb/src/main/java/org/cristalise/storage/jooqdb/lookup/JooqItemHandler.java b/jooqdb/src/main/java/org/cristalise/storage/jooqdb/lookup/JooqItemHandler.java
@@ -185,9 +185,18 @@ public static ItemPath getItemPath(DSLContext context, JooqItemPropertyHandler p
             if(isAgent) {
                 String name;
 
-                if (record.field(nameProp) != null) name = record.get(nameProp, String.class);
-                else                                name = ((Property)properties.fetch(context, uuid, nameProp)).getValue();
-
+                if (record.field(nameProp) != null) {
+                    name = record.get(nameProp, String.class);
+                } else {
+                    Property nameProperty = (Property) properties.fetch(context, uuid, nameProp);
+                    if (nameProperty == null) {
+                        return null;
+                    }
+                    name = nameProperty.getValue();
+                }
+                if (name == null) {
+                    return null;
+                }
                 return new AgentPath(uuid, ior, name, isTempPwd != null ? isTempPwd : false);
             }
             else