svn commit: r1452855 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBranch.java

[jukka]

Author: jukka
Date: Tue Mar  5 15:43:12 2013
New Revision: 1452855

URL: http://svn.apache.org/r1452855
Log:
OAK-593: Segment-based MK

It's best to assume that there were no other concurrent changes when merging a 
branch. If there weren't, we avoid an extra getHead() roundtrip. If there were, 
we try again a bit later after rebasing.

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBranch.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBranch.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBranch.java?rev=1452855&r1=1452854&r2=1452855&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBranch.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBranch.java
 Tue Mar  5 15:43:12 2013
@@ -84,8 +84,6 @@ class SegmentNodeStoreBranch implements 
     @Override @Nonnull
     public synchronized NodeState merge(CommitHook hook)
             throws CommitFailedException {
-        rebase();
-
         RecordId originalBaseId = baseId;
         RecordId originalRootId = rootId;
         long backoff = 1;