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

Do not issue a getNodeByKey() if we get a node by relation, just because it's not

Browse source 
a complex reference or create-one-demand relation! This was introduced because
we assumed that the calling code would know what it was doing, i.e. only call this for
objects contained in its subnode index, but as it seems to turn out it didn't, and this isn't
really necessary after all.
This commit is contained in:
hns 2003-12-03 11:58:36 +00:00
parent 2a8a21f822
commit 0f77c3461b
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/helma/objectmodel/db/NodeManager.java
View file

@ -202,14 +202,10 @@ public final class NodeManager {
public Node getNode(Key key) throws Exception {
Transactor tx = (Transactor) Thread.currentThread();
// tx.timer.beginEvent ("getNode "+kstr);
// it would be a good idea to reuse key objects one day.
// Key key = new Key (dbmap, kstr);
// See if Transactor has already come across this node
Node node = tx.getVisitedNode(key);
if ((node != null) && (node.getState() != Node.INVALID)) {
// tx.timer.endEvent ("getNode "+kstr);
return node;
}
@ -241,7 +237,7 @@ public final class NodeManager {
cache.put(node.getKey(), oldnode);
node = oldnode;
}
}
}
// end of cache-synchronized section
}
}
@ -279,9 +275,9 @@ public final class NodeManager {
// generated on the fly
key = new SyntheticKey(home.getKey(), kstr);
} else {
// refers to a node through its primary database key
key = new DbKey(rel.otherType, kstr);
return getNode(key);
// Not a relation we use can use getNodeByRelation() for
System.err.println(" WOMBAT: "+home+" ° "+kstr);
return null;
}
// See if Transactor has already come across this node