antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Avoid setting parent in setNode() if the property name isn't persistable.

Browse source
This commit is contained in:
hns 2006-11-30 21:04:44 +00:00
parent 5d5315f623
commit 8e71110ad4
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/helma/objectmodel/db/Node.java
View file

@ -2314,8 +2314,9 @@ public final class Node implements INode, Serializable {
throw new RuntimeException("Can't add fixed-transient node to a persistent node"); throw new RuntimeException("Can't add fixed-transient node to a persistent node");
} }
boolean isPersistable = isPersistableProperty(propname);
// if the new node is marked as TRANSIENT and this node is not, mark new node as NEW // if the new node is marked as TRANSIENT and this node is not, mark new node as NEW
if (state != TRANSIENT && n.state == TRANSIENT && isPersistableProperty(propname)) { if (state != TRANSIENT && n.state == TRANSIENT && isPersistable) {
n.makePersistable(); n.makePersistable();
} }
@ -2325,7 +2326,7 @@ public final class Node implements INode, Serializable {
// check if the main identity of this node is as a named property // check if the main identity of this node is as a named property
// or as an anonymous node in a collection // or as an anonymous node in a collection
if (n != this && !nmgr.isRootNode(n)) { if (n != this && !nmgr.isRootNode(n) && isPersistable) {
// avoid calling getParent() because it would return bogus results // avoid calling getParent() because it would return bogus results
// for the not-anymore transient node // for the not-anymore transient node
Node nparent = (n.parentHandle == null) ? null Node nparent = (n.parentHandle == null) ? null
@ -2390,7 +2391,7 @@ public final class Node implements INode, Serializable {
propMap.put(p2, prop); propMap.put(p2, prop);
if (state == CLEAN && isPersistableProperty(propname)) { if (state == CLEAN && isPersistable) {
markAs(MODIFIED); markAs(MODIFIED);
} }
} }