From acd45b4780ec8ab29242b75a1aed8f2ff2b43493 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 30 Mar 2023 17:08:43 +0200
Subject: [PATCH] FIX for #166
---
src/main/java/org/caosdb/server/jobs/Job.java | 2 +-
src/main/java/org/caosdb/server/jobs/core/Inheritance.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/caosdb/server/jobs/Job.java b/src/main/java/org/caosdb/server/jobs/Job.java
index 0e9d7ef7..9da74edd 100644
--- a/src/main/java/org/caosdb/server/jobs/Job.java
+++ b/src/main/java/org/caosdb/server/jobs/Job.java
@@ -555,7 +555,7 @@ public abstract class Job {
*
* @param entity the entity to be resolved.
* @return the resolved entity.
- * @throws EntityWasNotUniqueException if the resolution failed due to ambuiguity of the name.
+ * @throws EntityWasNotUniqueException if the resolution failed due to ambiguity of the name.
*/
protected EntityInterface resolve(final EntityInterface entity)
throws EntityWasNotUniqueException {
diff --git a/src/main/java/org/caosdb/server/jobs/core/Inheritance.java b/src/main/java/org/caosdb/server/jobs/core/Inheritance.java
index 33c77728..6ceb6295 100644
--- a/src/main/java/org/caosdb/server/jobs/core/Inheritance.java
+++ b/src/main/java/org/caosdb/server/jobs/core/Inheritance.java
@@ -140,6 +140,9 @@ public class Inheritance extends EntityJob {
if (getEntity().hasParents()) {
outer:
for (EntityInterface par : getEntity().getParents()) {
+ if (par.getEntityStatus() == EntityStatus.UNQUALIFIED) {
+ continue;
+ }
if (!par.hasProperties()) {
par = resolve(par);
}
--
GitLab