svn commit: r1736316 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java

[stefanegli]

Author: stefanegli
Date: Wed Mar 23 12:43:57 2016
New Revision: 1736316

URL: http://svn.apache.org/viewvc?rev=1736316&view=rev
Log:
OAK-4145 : re-adding 1736305 / 1736315 as it was only meant to be removed from 
1.4-branch, not trunk

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java?rev=1736316&r1=1736315&r2=1736316&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
 Wed Mar 23 12:43:57 2016
@@ -662,6 +662,11 @@ public class ClusterNodeInfo {
                     break;
                 }
             }
+            if (leaseCheckFailed) {
+                // someone else won and marked leaseCheckFailed - so we only 
log/throw
+                LOG.error(LEASE_CHECK_FAILED_MSG);
+                throw new AssertionError(LEASE_CHECK_FAILED_MSG);
+            }
             leaseCheckFailed = true; // make sure only one thread 'wins', ie 
goes any further
         }