From 3101e32ad3773a4675b9bb39f83a0e34d10fe088 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Wed, 4 Feb 2004 16:30:31 +0000
Subject: [PATCH] * Do not try to get child nodes from NodeManager if self is
 transient * Throw an exception when trying to get a group-subnode from a   
 transient node (it doesn't work, so better be clear about it) * Do not set
 "name" property in groupby nodes, just stick with "groupname" * Always set
 node properties in propMap if self is transient

---
 src/helma/objectmodel/db/Node.java | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/helma/objectmodel/db/Node.java b/src/helma/objectmodel/db/Node.java
index c5b1d0b9..dbd804a1 100644
--- a/src/helma/objectmodel/db/Node.java
+++ b/src/helma/objectmodel/db/Node.java
@@ -1004,7 +1004,7 @@ public final class Node implements INode, Serializable {
             rel = dbmap.getSubnodeRelation();
 
             if ((rel != null) && (rel.groupby != null || rel.accessName != null)) {
-                if ((rel.otherType != null) && rel.otherType.isRelational()) {
+                if (state != TRANSIENT && rel.otherType != null && rel.otherType.isRelational()) {
                     return nmgr.getNode(this, name, rel);
                 } else {
                     return getNode(name);
@@ -1125,15 +1125,22 @@ public final class Node implements INode, Serializable {
      * @return ...
      */
     protected Node getGroupbySubnode(String sid, boolean create) {
+        if (sid == null) {
+            throw new IllegalArgumentException("Can't create group by null");
+        }
+
+        if (state == TRANSIENT) {
+            throw new RuntimeException("Can't add grouped child on transient node. "+
+                                       "Make parent persistent before adding grouped nodes.");
+        }
+
         loadNodes();
 
         if (subnodes == null) {
             subnodes = new ExternalizableVector();
         }
 
-        NodeHandle ghandle = new NodeHandle(new SyntheticKey(getKey(), sid));
-
-        if (subnodes.contains(ghandle) || create) {
+        if (create || subnodes.contains(new NodeHandle(new SyntheticKey(getKey(), sid)))) {
             try {
                 DbMapping groupbyMapping = dbmap.getGroupbyMapping();
                 boolean relational = groupbyMapping.getSubnodeMapping().isRelational();
@@ -1144,7 +1151,6 @@ public final class Node implements INode, Serializable {
 
                     // set "groupname" property to value of groupby field
                     node.setString("groupname", sid);
-                    node.setString("name", sid);
                         
                     node.setDbMapping(groupbyMapping);
 
@@ -2183,8 +2189,11 @@ public final class Node implements INode, Serializable {
 
         prop.setNodeValue(n);
 
-        if ((rel == null) || (rel.reftype == Relation.REFERENCE) || rel.virtual ||
-                (rel.otherType == null) || !rel.otherType.isRelational()) {
+        if ((rel == null) ||
+                rel.reftype == Relation.REFERENCE ||
+                state == TRANSIENT ||
+                rel.otherType == null ||
+                !rel.otherType.isRelational()) {
             // the node must be stored as explicit property
             if (propMap == null) {
                 propMap = new Hashtable();
@@ -2401,7 +2410,7 @@ public final class Node implements INode, Serializable {
 
     /**
      * This method walks down node path to the first non-virtual node and return it.
-     *  limit max depth to 3, since there shouldn't be more then 2 layers of virtual nodes.
+     *  limit max depth to 5, since there shouldn't be more then 2 layers of virtual nodes.
      */
     public Node getNonVirtualParent() {
         Node node = this;