diff --git a/src/main/java/org/caosdb/server/jobs/Job.java b/src/main/java/org/caosdb/server/jobs/Job.java index 0e9d7ef79377884853caa2198c84d428aed38e01..9da74edd0db86f6d81a8636020afcdaf3faa9e09 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 33c7772811d36a5b9430556fc8926e88e2cd302c..6ceb629506de3f2e8d491dfeb4d705af374c6e0b 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); }