[MMBASE SCM] r38611 - mmbase/trunk/core/src/main/java/org/mmbase/module/core

[michiel]

Author: michiel
Date: 2009-09-14 18:00:48 +0200 (Mon, 14 Sep 2009)
New Revision: 38611

Modified:
   
mmbase/trunk/core/src/main/java/org/mmbase/module/core/TransactionManager.java
Log:
There is no point in removing nodes from storage which never existed

Modified: 
mmbase/trunk/core/src/main/java/org/mmbase/module/core/TransactionManager.java
===================================================================
--- 
mmbase/trunk/core/src/main/java/org/mmbase/module/core/TransactionManager.java  
    2009-09-14 15:58:34 UTC (rev 38610)
+++ 
mmbase/trunk/core/src/main/java/org/mmbase/module/core/TransactionManager.java  
    2009-09-14 16:00:48 UTC (rev 38611)
@@ -409,10 +409,14 @@
                 NodeState state = stati.get(node.getNumber());
                 if (!(node.getBuilder() instanceof InsRel) && (state.exists == 
Exists.NOLONGER)) {
                     // no return information
-                    if (user instanceof UserContext) {
-                        node.remove((UserContext)user);
+                    if (node.getNumber() > 0) {
+                        if (user instanceof UserContext) {
+                            node.remove((UserContext)user);
+                        } else {
+                            node.parent.removeNode(node);
+                        }
                     } else {
-                        node.parent.removeNode(node);
+                        log.debug("Node " + node + " was never committed to 
the database, so does not need to be removed from it");
                     }
                     state.state = State.COMMITED;
                 }

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs