jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r544239 - /jackrabbit/branches/1.3/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/PathMap.java
Date Mon, 04 Jun 2007 20:10:37 GMT
Author: jukka
Date: Mon Jun  4 13:10:35 2007
New Revision: 544239

URL: http://svn.apache.org/viewvc?view=rev&rev=544239
Log:
1.3: Merged revision 542837 (JCR-950)

Modified:
    jackrabbit/branches/1.3/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/PathMap.java

Modified: jackrabbit/branches/1.3/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/PathMap.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/PathMap.java?view=diff&rev=544239&r1=544238&r2=544239
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/PathMap.java
(original)
+++ jackrabbit/branches/1.3/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/PathMap.java
Mon Jun  4 13:10:35 2007
@@ -324,6 +324,12 @@
         public void remove(boolean shift) {
             if (parent != null) {
                 parent.remove(getPathElement(), shift);
+            } else {
+                // Removing the root node is not possible: if it has become
+                // invalid, remove all its children and the associated object
+                children = null;
+                childrenCount = 0;
+                obj = null;
             }
         }
 



Mime
View raw message