Handle null values in CAttributeTuple.isValidValue. Not sure if correct

nedap · Jul 19, 2017 · edeb91d · edeb91d
1 parent 2a7ca4c
commit edeb91d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/com/nedap/archie/aom/CAttributeTuple.java b/src/main/java/com/nedap/archie/aom/CAttributeTuple.java
@@ -75,7 +75,13 @@ private boolean isValid(ModelInfoLookup lookup, CPrimitiveTuple tuple, HashMap<S
             String attributeName = attribute.getRmAttributeName();
 
             CPrimitiveObject cPrimitiveObject = tuple.getMembers().get(index);
-            if(!cPrimitiveObject.isValidValue(lookup, values.get(attributeName))) {
+            Object value = values.get(attributeName);
+            if(value == null) {
+                return false;
+                //alternatively, look at occurrences or parent attribute existence?
+                //not sure if we should in a tuple - a constrained value that is null is generally an error
+            }
+            if(!cPrimitiveObject.isValidValue(lookup, value)) {
                 return false;
             }
             index++;