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

[mduerig]

Author: mduerig
Date: Thu Apr  6 16:32:00 2017
New Revision: 1790425

URL: http://svn.apache.org/viewvc?rev=1790425&view=rev
Log:
OAK-4122 - Replace the commit semaphore in the segment node store with a 
scheduler
Fix failing test NodeStoreTest.mergeNodeRoot

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/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=1790425&r1=1790424&r2=1790425&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 Apr  6 16:32:00 2017
@@ -190,6 +190,8 @@ public class SegmentNodeStore implements
     public NodeState merge(
             @Nonnull NodeBuilder builder, @Nonnull CommitHook commitHook,
             @Nonnull CommitInfo info) throws CommitFailedException {
+        checkArgument(builder instanceof SegmentNodeBuilder);
+        checkArgument(((SegmentNodeBuilder) builder).isRootBuilder());
         return scheduler.schedule(new Commit(builder, commitHook, info));
     }