* Always set parent to null if _parent is set and didn't turn up a result
* Enable _parent resolution for non-relational objects if it is set
This commit is contained in:
parent
304c08f8a3
commit
cdba357096
1 changed files with 5 additions and 3 deletions
|
@ -702,8 +702,7 @@ public final class Node implements INode, Serializable {
|
||||||
// check what's specified in the type.properties for this node.
|
// check what's specified in the type.properties for this node.
|
||||||
ParentInfo[] parentInfo = null;
|
ParentInfo[] parentInfo = null;
|
||||||
|
|
||||||
if (isRelational() &&
|
if (lastParentSet <= Math.max(dbmap.getLastTypeChange(), lastmodified)) {
|
||||||
(lastParentSet <= Math.max(dbmap.getLastTypeChange(), lastmodified))) {
|
|
||||||
parentInfo = dbmap.getParentInfo();
|
parentInfo = dbmap.getParentInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -756,7 +755,10 @@ public final class Node implements INode, Serializable {
|
||||||
}
|
}
|
||||||
} catch (Exception ignore) {
|
} catch (Exception ignore) {
|
||||||
}
|
}
|
||||||
} else if (i == parentInfo.length-1) {
|
}
|
||||||
|
if (i == parentInfo.length-1) {
|
||||||
|
// if we came till here and we didn't find a parent.
|
||||||
|
// set parent to null.
|
||||||
setParent(null);
|
setParent(null);
|
||||||
lastParentSet = System.currentTimeMillis();
|
lastParentSet = System.currentTimeMillis();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue