svn commit: r1771136 - in /jackrabbit/oak/trunk: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java

[chetanm]

Author: chetanm
Date: Thu Nov 24 14:02:11 2016
New Revision: 1771136

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

-- Use CommitInfo.EMPTY_EXTERNAL instead of null

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
    
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java?rev=1771136&r1=1771135&r2=1771136&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
 Thu Nov 24 14:02:11 2016
@@ -274,7 +274,7 @@ public class SegmentNodeStore implements
         if (!state.getRecordId().equals(head.get().getRecordId())) {
             head.set(state);
             if (dispatchChanges) {
-                contentChanged(state.getChildNode(ROOT), null);
+                contentChanged(state.getChildNode(ROOT), 
CommitInfo.EMPTY_EXTERNAL);
             }
         }
     }

Modified: 
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java?rev=1771136&r1=1771135&r2=1771136&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
 Thu Nov 24 14:02:11 2016
@@ -254,7 +254,7 @@ public class SegmentNodeStore implements
         if (!state.getRecordId().equals(head.get().getRecordId())) {
             head.set(state);
             if (dispatchChanges) {
-                changeDispatcher.contentChanged(state.getChildNode(ROOT), 
null);
+                changeDispatcher.contentChanged(state.getChildNode(ROOT), 
CommitInfo.EMPTY_EXTERNAL);
             }
         }
     }