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

Posted to commits@jackrabbit.apache.org by an...@apache.org on 2011/06/16 12:17:41 UTC

svn commit: r1136360 - /jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java

Author: angela
Date: Thu Jun 16 10:17:41 2011
New Revision: 1136360

URL: http://svn.apache.org/viewvc?rev=1136360&view=rev
Log:
JCR-2981 - Bundle of events may be dropped due to NPE (applying patch provided by timothee maret)

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

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java?rev=1136360&r1=1136359&r2=1136360&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java Thu Jun 16 10:17:41 2011
@@ -89,7 +89,7 @@ public class HierarchyManagerImpl implem
             if (path == null) {
                 return nEntry;
             } else {
-                return nEntry.lookupDeepEntry(path);
+                return nEntry != null ? nEntry.lookupDeepEntry(path) : null;
             }
         }
     }