You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by md...@apache.org on 2010/02/03 12:13:10 UTC

svn commit: r905997 - /jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java

Author: mduerig
Date: Wed Feb  3 11:13:07 2010
New Revision: 905997

URL: http://svn.apache.org/viewvc?rev=905997&view=rev
Log:
JCR-2484: NPE if RepositoryService#getItemInfos throws ItemNotFoundException

Modified:
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java?rev=905997&r1=905996&r2=905997&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java Wed Feb  3 11:13:07 2010
@@ -416,7 +416,7 @@
             }
         } else {
             // unresolved
-            if (!staleParent) {
+            if (!staleParent && parent != null) {
                 parent.internalRemoveChildEntry(this);
             }
         }