jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1490182 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeDispatcher.java
Date Thu, 06 Jun 2013 07:32:22 GMT
Author: mduerig
Date: Thu Jun  6 07:32:22 2013
New Revision: 1490182

URL: http://svn.apache.org/r1490182
Log:
OAK-775 Implement backward compatible observation
null check for the case where there are no external changes

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeDispatcher.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=1490182&r1=1490181&r2=1490182&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
Thu Jun  6 07:32:22 2013
@@ -192,7 +192,10 @@ public class ChangeDispatcher {
         @CheckForNull
         public ChangeSet getChanges() {
             if (changeSets.isEmpty()) {
-                add(externalChange(store.getRoot()));
+                ChangeSet changeSet = externalChange(store.getRoot());
+                if (changeSet != null) {
+                    add(changeSet);
+                }
             }
             return changeSets.isEmpty() ? null : changeSets.remove();
         }



Mime
View raw message