Skip to content
Snippets Groups Projects
Commit 3cb82095 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

FIX: Added an additional check for ID > 0

parent 6752497d
No related branches found
No related tags found
2 merge requests!21Release v0.4.0,!18fix importance bug
Pipeline #8942 passed
......@@ -561,25 +561,24 @@ public abstract class Job {
*/
protected EntityInterface resolve(final EntityInterface entity)
throws EntityWasNotUniqueException {
EntityInterface resolvedParent = null;
// if the parent has an id>0, it is to be a valid entity.
EntityInterface resolvedEntity = null;
if (!entity.hasId() && entity.hasName()) {
resolvedParent = getEntityByName(entity.getName());
if (resolvedParent == null) {
resolvedEntity = getEntityByName(entity.getName());
if (resolvedEntity == null) {
final Integer eid = retrieveValidIDByName(entity.getName());
entity.setId(eid);
}
}
if (entity.hasId()) {
// get parent from container
resolvedParent = getEntityById(entity.getId());
if (resolvedParent == null) {
resolvedParent = retrieveValidEntity(entity.getId());
// get entity from container
resolvedEntity = getEntityById(entity.getId());
if (resolvedEntity == null && entity.getId() > 0) {
resolvedEntity = retrieveValidEntity(entity.getId());
}
}
return resolvedParent;
return resolvedEntity;
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment