svn commit: r1536290 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java

[mduerig]

Author: mduerig
Date: Mon Oct 28 09:30:50 2013
New Revision: 1536290

URL: http://svn.apache.org/r1536290
Log:
OAK-1113: Immediate delivery of events from local commits
Avoid potential NPE on return value of getChanges()

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java?rev=1536290&r1=1536289&r2=1536290&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
 Mon Oct 28 09:30:50 2013
@@ -164,7 +164,8 @@ public class ChangeProcessor {
                 while (!stopping) {
                     EventFilter filter = filterRef.get();
                     // FIXME don't rely on toString for session id
-                    if (!(filter.excludeLocal() && 
changes.isLocal(contentSession.toString()))) {
+                    if (changes != null &&
+                            !(filter.excludeLocal() && 
changes.isLocal(contentSession.toString()))) {
                         String path = 
namePathMapper.getOakPath(filter.getPath());
                         ImmutableTree beforeTree = 
getTree(changes.getBeforeState(), path);
                         ImmutableTree afterTree = 
getTree(changes.getAfterState(), path);