You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by st...@apache.org on 2016/03/23 11:13:47 UTC

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

Author: stefanegli
Date: Wed Mar 23 10:13:47 2016
New Revision: 1736305

URL: http://svn.apache.org/viewvc?rev=1736305&view=rev
Log:
OAK-4145 : ensure leaseFailureHandler is not called multiple times

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=1736305&r1=1736304&r2=1736305&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 10:13:47 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
         }