Skip to content

Commit 30ce854

Browse files
committed
Allow merging null values
Optional OCMF fields like GV should be merged successfully even when their values are null.
1 parent f08fc0f commit 30ce854

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/main/java/com/hastobe/transparenzsoftware/verification/result/VerificationResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public static VerificationResult mergeVerificationData(VerificationResult start,
113113
for (String key : start.getAdditionalVerificationData().keySet()) {
114114
Object o1 = start.getAdditionalVerificationData().get(key);
115115
Object o2 = stop.getAdditionalVerificationData().get(key);
116-
if (o1.equals(o2)) {
116+
if (o1 == o2 || (o1 != null && o1.equals(o2))) {
117117
additionalDataMerged.put(key, o1);
118118
} else {
119119
additionalDataMerged.put(String.format("%s (start)", key), o1);

0 commit comments

Comments
 (0)