From cdba357096d4937afe759288a6fd9d8a2131d4dc Mon Sep 17 00:00:00 2001 From: hns Date: Wed, 10 Mar 2004 12:55:30 +0000 Subject: [PATCH] * 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 --- src/helma/objectmodel/db/Node.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/helma/objectmodel/db/Node.java b/src/helma/objectmodel/db/Node.java index b6db93b0..48d517c4 100644 --- a/src/helma/objectmodel/db/Node.java +++ b/src/helma/objectmodel/db/Node.java @@ -702,8 +702,7 @@ public final class Node implements INode, Serializable { // check what's specified in the type.properties for this node. ParentInfo[] parentInfo = null; - if (isRelational() && - (lastParentSet <= Math.max(dbmap.getLastTypeChange(), lastmodified))) { + if (lastParentSet <= Math.max(dbmap.getLastTypeChange(), lastmodified)) { parentInfo = dbmap.getParentInfo(); } @@ -756,7 +755,10 @@ public final class Node implements INode, Serializable { } } 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); lastParentSet = System.currentTimeMillis(); }