From 337928ee4a2c89ab5ca89e741fb043316123125b Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Thu, 28 Mar 2002 16:22:06 +0000
Subject: [PATCH] Fixed bug 66:  setParent() doesn't overrule _parent anymore

This was caused by lastParentSet not being set not being updated
in the setParent() method called from JavaScript, so if it hadn't already been
set before, getParent would still do its whole parent evaluation
work, overwriting the previously set parent.

Fixed bug 68:  _extends does not allow additional property mappings

The problem was that the standard (parent) prototype mapping was alweys
used to initialize new Nodes from a SQL result set in the relational Node
constructor. The right sub-prototype was determined at the beginning,
but since both the method parameter and the class fields were called dbmap,
the local parameter was used for initializing the node's properties.
---
 src/helma/objectmodel/db/Node.java | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/helma/objectmodel/db/Node.java b/src/helma/objectmodel/db/Node.java
index 2cb528f9..92de70be 100644
--- a/src/helma/objectmodel/db/Node.java
+++ b/src/helma/objectmodel/db/Node.java
@@ -212,33 +212,32 @@ public final class Node implements INode, Serializable {
     /**
      * Constructor used for nodes being stored in a relational database table.
      */
-    public Node (DbMapping dbmap, Record rec, WrappedNodeManager nmgr) throws DataSetException {
+    public Node (DbMapping dbm, Record rec, WrappedNodeManager nmgr) throws DataSetException {
 
 	this.nmgr = nmgr;
 	// see what prototype/DbMapping this object should use
-	DbMapping m = dbmap;
+	dbmap = dbm;
 	String protoField= dbmap.getPrototypeField ();
 	if (protoField != null) {
 	    Value val = rec.getValue (protoField);
 	    if (val != null && !val.isNull ()) {
 	        String protoName = val.asString ();
-	        m = nmgr.getDbMapping (protoName);
-	        if (m == null) {
+	        dbmap = nmgr.getDbMapping (protoName);
+	        if (dbmap == null) {
 	            // invalid prototype name!
 	            System.err.println ("Warning: Invalid prototype name: "+protoName+" - using default");
-	            m = dbmap;
+	            dbmap = dbm;
 	        }
 	    }
 	}
-	setPrototype (m.getTypeName ());
-	this.dbmap = m;
+	setPrototype (dbmap.getTypeName ());
 
 	id = rec.getValue (dbmap.getIDField ()).asString ();
 	// checkWriteLock ();
 	String nameField =  dbmap.getNameField ();
 	name = nameField == null ? id : rec.getValue (nameField).asString ();
 	if (name == null || name.length() == 0)
-	    name = m.getTypeName() + " " + id;
+	    name = dbmap.getTypeName() + " " + id;
 	// set parent for user objects to internal userroot node
 	if ("user".equals (prototype)) {
 	    parentHandle = new NodeHandle (new DbKey (null, "1"));
@@ -590,7 +589,9 @@ public final class Node implements INode, Serializable {
 
 	NodeHandle oldParentHandle = parentHandle;
 	parentHandle = parent == null ? null : parent.getHandle ();
-
+	// mark parent as set, otherwise getParent will try to
+	// determine the parent again when called.
+	lastParentSet = System.currentTimeMillis ();
 	if (parentHandle == null || parentHandle.equals (oldParentHandle))
 	    // nothing changed, no need to find access property
 	    return;