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

[mduerig]

Author: mduerig
Date: Wed Oct 16 15:39:39 2013
New Revision: 1532802

URL: http://svn.apache.org/r1532802
Log:
OAK-144 Implement observation
More precise evaluation of the isLocal flag

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeDispatcher.java
    
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/ChangeDispatcher.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeDispatcher.java?rev=1532802&r1=1532801&r2=1532802&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeDispatcher.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeDispatcher.java
 Wed Oct 16 15:39:39 2013
@@ -250,7 +250,7 @@ public class ChangeDispatcher {
         }
 
         public boolean isLocal(String sessionId) {
-            return Objects.equal(getSessionId(), sessionId);
+            return !isExternal && Objects.equal(getSessionId(), sessionId);
         }
 
         @CheckForNull

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=1532802&r1=1532801&r2=1532802&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
 Wed Oct 16 15:39:39 2013
@@ -191,7 +191,6 @@ public class ChangeProcessor implements 
             while (!stopping && changes != null) {
                 EventFilter filter = filterRef.get();
                 // FIXME don't rely on toString for session id
-                // FIXME make cluster node id part of session id to make 
session id unique across all cluster nodes
                 if (!(filter.excludeLocal() && 
changes.isLocal(contentSession.toString()))) {
                     String path = namePathMapper.getOakPath(filter.getPath());
                     ImmutableTree beforeTree = 
getTree(changes.getBeforeState(), path);