From a21e6464f6f641141792e7c38de71dd9f04af958 Mon Sep 17 00:00:00 2001 From: hns Date: Tue, 9 Mar 2004 16:36:21 +0000 Subject: [PATCH] * Actually set parent to null if _parent is set but couldn't be resolved in getParent(). * Use <= rather than < to test if we should recompute in getElementName() and getParent(). --- src/helma/objectmodel/db/Node.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/helma/objectmodel/db/Node.java b/src/helma/objectmodel/db/Node.java index 4afad8a6..b6db93b0 100644 --- a/src/helma/objectmodel/db/Node.java +++ b/src/helma/objectmodel/db/Node.java @@ -417,7 +417,7 @@ public final class Node implements INode, Serializable { if (isRelational()) { long lastmod = Math.max(lastmodified, dbmap.getLastTypeChange()); - if ((parentHandle != null) && (lastNameCheck < lastmod)) { + if ((parentHandle != null) && (lastNameCheck <= lastmod)) { try { Node p = parentHandle.getNode(nmgr); DbMapping parentmap = p.getDbMapping(); @@ -703,7 +703,7 @@ public final class Node implements INode, Serializable { ParentInfo[] parentInfo = null; if (isRelational() && - (lastParentSet < Math.max(dbmap.getLastTypeChange(), lastmodified))) { + (lastParentSet <= Math.max(dbmap.getLastTypeChange(), lastmodified))) { parentInfo = dbmap.getParentInfo(); } @@ -756,6 +756,9 @@ public final class Node implements INode, Serializable { } } catch (Exception ignore) { } + } else if (i == parentInfo.length-1) { + setParent(null); + lastParentSet = System.currentTimeMillis(); } } }