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

* Fix bug where 0 is assumed as id of the root object in getParent()

Browse source 
* Fix bug where child node is set to anonymous after calling addNode()
This commit is contained in:
hns 2005-02-26 08:57:43 +00:00
parent 700f2b41ea
commit 4d0d1b33bb
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -737,7 +737,8 @@ public final class Node implements INode, Serializable {
// the parent of this node is the app's root node...
if ((pn == null) && pinfo.isroot) {
pn = nmgr.getNode("0", nmgr.getDbMapping("root"));
pn = nmgr.getNode(nmgr.nmgr.app.getProperty("rootid", "0"),
nmgr.getDbMapping("root"));
}
// if we found a parent node, check if we ought to use a virtual or groupby node as parent
@ -889,19 +890,13 @@ public final class Node implements INode, Serializable {
}
}
} else {
// create subnode list if necessary
if (subnodes == null) {
subnodes = new ExternalizableVector();
}
synchronized (subnodes) {
// check if index is out of bounds when adding
if (where < 0 || where > subnodes.size()) {
subnodes.add(nhandle);
} else {
subnodes.add(where, nhandle);
}
}
// check if subnode accessname is set
// check if subnode accessname is set. If so, check if another node
// uses the same access name and remove it
if ((dbmap != null) && (node.dbmap != null)) {
Relation prel = dbmap.getSubnodeRelation();
@ -935,6 +930,16 @@ public final class Node implements INode, Serializable {
}
}
// actually add the new child to the subnode list
synchronized (subnodes) {
// check if index is out of bounds when adding
if (where < 0 || where > subnodes.size()) {
subnodes.add(nhandle);
} else {
subnodes.add(where, nhandle);
}
}
if (node != this && !"root".equalsIgnoreCase(node.getPrototype())) {
// avoid calling getParent() because it would return bogus results
// for the not-anymore transient node
@ -952,6 +957,8 @@ public final class Node implements INode, Serializable {
}
lastmodified = System.currentTimeMillis();
// we want the element name to be recomputed on the child node
node.lastNameCheck = 0;
registerSubnodeChange();
return node;