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

* Fix bug 582, which is a regression caused by the fix for bug 551.

Browse source 
http://helma.org/bugs/show_bug.cgi?id=582
  http://helma.org/bugs/show_bug.cgi?id=551
This commit is contained in:
hns 2007-12-10 10:47:41 +00:00
parent 3fcdfd72ce
commit 891d0f74e1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1858,10 +1858,11 @@ public final class NodeManager {
return null; return null;
} else if (Thread.currentThread() instanceof Transactor) { } else if (Thread.currentThread() instanceof Transactor) {
// Check if the node is already registered with the transactor - // Check if the node is already registered with the transactor -
// it may be in the process of being DELETED. // it may be in the process of being DELETED, but do return the
// new node if the old one has been marked as INVALID.
DbKey key = new DbKey(dbmap, id); DbKey key = new DbKey(dbmap, id);
Node dirtyNode = ((Transactor) Thread.currentThread()).getDirtyNode(key); Node dirtyNode = ((Transactor) Thread.currentThread()).getDirtyNode(key);
if (dirtyNode != null) { if (dirtyNode != null && dirtyNode.getState() != Node.INVALID) {
return dirtyNode; return dirtyNode;
} }
} }