You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2016/11/24 14:01:47 UTC

svn commit: r1771134 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins: memory/MemoryNodeStore.java multiplex/MultiplexingNodeStore.java

Author: chetanm
Date: Thu Nov 24 14:01:46 2016
New Revision: 1771134

URL: http://svn.apache.org/viewvc?rev=1771134&view=rev
Log:
OAK-4898 - Allow for external changes to have a CommitInfo attached

-- Switch to Nonnull annotation for CommitInfo param
-- Pass CommitInfo.EMPTY_EXTERNAL while dispatching changes
   - As part of initial Observer registration

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStore.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java?rev=1771134&r1=1771133&r2=1771134&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java Thu Nov 24 14:01:46 2016
@@ -84,7 +84,7 @@ public class MemoryNodeStore implements
 
     @Override
     public synchronized Closeable addObserver(Observer observer) {
-        observer.contentChanged(getRoot(), null);
+        observer.contentChanged(getRoot(), CommitInfo.EMPTY_EXTERNAL);
 
         Closeable closeable = new Closeable() {
             @Override
@@ -124,7 +124,7 @@ public class MemoryNodeStore implements
     @Override
     public synchronized NodeState merge(
             @Nonnull NodeBuilder builder, @Nonnull CommitHook commitHook,
-            @Nullable CommitInfo info) throws CommitFailedException {
+            @Nonnull CommitInfo info) throws CommitFailedException {
         checkArgument(builder instanceof MemoryNodeBuilder);
         MemoryNodeBuilder mnb = (MemoryNodeBuilder) builder;
         checkArgument(mnb.isRoot());

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStore.java?rev=1771134&r1=1771133&r2=1771134&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStore.java Thu Nov 24 14:01:46 2016
@@ -277,7 +277,7 @@ public class MultiplexingNodeStore imple
 
     @Override
     public Closeable addObserver(final Observer observer) {
-        observer.contentChanged(getRoot(), null);
+        observer.contentChanged(getRoot(), CommitInfo.EMPTY_EXTERNAL);
         observers.add(observer);
         return new Closeable() {
             @Override