From 6b631e0f0e0e8c0550b98a721f8e25d4ff12a9da Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Thu, 12 Feb 2004 14:32:01 +0000
Subject: [PATCH] * Fix bug where fresh groupnode was not registered with
 nodemanager    when created from addNode() * Fix bug where named child node
 wasn't evicted when the name property    was changed because we tried
 getNode() rather than getChildElement()

---
 src/helma/objectmodel/db/Node.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/helma/objectmodel/db/Node.java b/src/helma/objectmodel/db/Node.java
index 3f1aba9d..530a107b 100644
--- a/src/helma/objectmodel/db/Node.java
+++ b/src/helma/objectmodel/db/Node.java
@@ -847,7 +847,7 @@ public final class Node implements INode, Serializable {
                 String groupbyProp = (groupbyRel != null) ? groupbyRel.propName
                                                               : srel.groupby;
                 String groupbyValue = node.getString(groupbyProp);
-                INode groupbyNode = getNode(groupbyValue);
+                INode groupbyNode = (INode) getChildElement(groupbyValue);
 
                 // if group-by node doesn't exist, we'll create it
                 if (groupbyNode == null) {
@@ -1167,8 +1167,15 @@ public final class Node implements INode, Serializable {
                         subnodes.add(node.getHandle());
                     }
 
+                    // Set the dbmapping on the group node
                     node.setPrototype(groupbyMapping.getTypeName());
-                    nmgr.evictKey(node.getKey());
+                    // If we created the group node, we register it with the 
+                    // nodemanager. Otherwise, we just evict whatever was there before
+                    if (create) {
+                        nmgr.registerNode(node);
+                    } else {
+                        nmgr.evictKey(node.getKey());
+                    }
 
                     return node;
                 }
@@ -1869,7 +1876,7 @@ public final class Node implements INode, Serializable {
 
             if ((propRel != null) && (propRel.accessName != null) &&
                     propRel.accessName.equals(dbcolumn)) {
-                INode n = parent.getNode(value);
+                INode n = (INode) parent.getChildElement(value);
 
                 if ((n != null) && (n != this)) {
                     parent.unset(value);