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 2011/08/16 17:44:12 UTC

svn commit: r1158330 - /jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java

Author: mduerig
Date: Tue Aug 16 15:44:12 2011
New Revision: 1158330

URL: http://svn.apache.org/viewvc?rev=1158330&view=rev
Log:
JCR-3055 NPE in event polling thread

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

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java?rev=1158330&r1=1158329&r2=1158330&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java Tue Aug 16 15:44:12 2011
@@ -901,7 +901,7 @@ public class NodeEntryImpl extends Hiera
         ItemId eventId = childEvent.getItemId();
         Path eventPath = childEvent.getPath();
         Name eventName = eventPath.getName();
-        HierarchyEntry child = lookupEntry(eventId, eventPath);
+        HierarchyEntry child = eventId == null ? null : lookupEntry(eventId, eventPath);
 
         switch (childEvent.getType()) {
             case Event.NODE_ADDED: