jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r576296 - /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
Date Mon, 17 Sep 2007 08:22:18 GMT
Author: mreutegg
Date: Mon Sep 17 01:22:17 2007
New Revision: 576296

URL: http://svn.apache.org/viewvc?rev=576296&view=rev
Log:
JCR-1131: JCR2SPI NodeEntryImpl throws NPE during reorderNodes

Modified:
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java?rev=576296&r1=576295&r2=576296&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
(original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
Mon Sep 17 01:22:17 2007
@@ -1351,7 +1351,10 @@
      */
     private void completeTransientChanges() {
         // old parent can forget this one
-        revertInfo.oldParent.childNodeAttic.remove(this);
+        // root entry does not have oldParent
+        if (revertInfo.oldParent != null) {
+            revertInfo.oldParent.childNodeAttic.remove(this);
+        }
         revertInfo.dispose();
         revertInfo = null;
     }



Mime
View raw message