From 0e2927e6c1450284576dcae986de5c5cc506488b Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Thu, 13 Dec 2018 02:20:59 +0100
Subject: [PATCH] BUG: detection of additional properties
---
.../server/jobs/core/CheckNoAdditionalPropertiesPresent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/caosdb/server/jobs/core/CheckNoAdditionalPropertiesPresent.java b/src/main/java/caosdb/server/jobs/core/CheckNoAdditionalPropertiesPresent.java
index 9ae84d3c..1eb4941d 100644
--- a/src/main/java/caosdb/server/jobs/core/CheckNoAdditionalPropertiesPresent.java
+++ b/src/main/java/caosdb/server/jobs/core/CheckNoAdditionalPropertiesPresent.java
@@ -7,6 +7,7 @@ import caosdb.server.jobs.JobAnnotation;
import caosdb.server.utils.EntityStatus;
import caosdb.server.utils.ServerMessages;
import java.util.HashSet;
+import java.util.Objects;
import java.util.Set;
@JobAnnotation(
@@ -52,6 +53,6 @@ public class CheckNoAdditionalPropertiesPresent extends EntityJob {
}
private boolean sameProperty(EntityInterface property, EntityInterface parentProperty) {
- return property.getId() == parentProperty.getId();
+ return property.getId() != null && Objects.equals(property.getId(), parentProperty.getId());
}
}
--
GitLab