svn commit: r1544137 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeStoreBranch.java

[mreutegg]

Author: mreutegg
Date: Thu Nov 21 11:50:09 2013
New Revision: 1544137

URL: http://svn.apache.org/r1544137
Log:
OAK-1212: InMemory merge retries too aggressive

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeStoreBranch.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeStoreBranch.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeStoreBranch.java?rev=1544137&r1=1544136&r2=1544137&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeStoreBranch.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeStoreBranch.java
 Thu Nov 21 11:50:09 2013
@@ -404,7 +404,7 @@ public abstract class AbstractNodeStoreB
                 throws CommitFailedException {
             try {
                 CommitFailedException ex = null;
-                for (long backoff = 1; backoff < maximumBackoff; backoff *= 2) 
{
+                for (long backoff = 100; backoff < maximumBackoff; backoff *= 
2) {
                     if (ex != null) {
                         try {
                             Thread.sleep(backoff, RANDOM.nextInt(1000000));