Allow merging null values

Optional OCMF fields like GV should be merged successfully even when their values are null.
SAFE-eV · Sep 2, 2020 · 30ce854 · 30ce854
1 parent f08fc0f
commit 30ce854
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/com/hastobe/transparenzsoftware/verification/result/VerificationResult.java b/src/main/java/com/hastobe/transparenzsoftware/verification/result/VerificationResult.java
@@ -113,7 +113,7 @@ public static VerificationResult mergeVerificationData(VerificationResult start,
         for (String key : start.getAdditionalVerificationData().keySet()) {
             Object o1 = start.getAdditionalVerificationData().get(key);
             Object o2 = stop.getAdditionalVerificationData().get(key);
-            if (o1.equals(o2)) {
+            if (o1 == o2 || (o1 != null && o1.equals(o2))) {
                 additionalDataMerged.put(key, o1);
             } else {
                 additionalDataMerged.put(String.format("%s (start)", key), o1);