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

[stefanegli]

Author: stefanegli
Date: Wed Aug 17 11:24:52 2016
New Revision: 1756616

URL: http://svn.apache.org/viewvc?rev=1756616&view=rev
Log:
OAK-4664 : passing setLeaseCheck parameter to the ClusterNodeInfo's 
leaseCheckDisabled flag

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.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=1756616&r1=1756615&r2=1756616&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 Aug 17 11:24:52 2016
@@ -306,7 +306,7 @@ public class ClusterNodeInfo {
      * lease check - hence there's a system property that does that:
      * oak.documentMK.disableLeaseCheck
      */
-    private final boolean leaseCheckDisabled;
+    private boolean leaseCheckDisabled;
 
     /**
      * Tracks the fact whether the lease has *ever* been renewed by this 
instance
@@ -350,6 +350,10 @@ public class ClusterNodeInfo {
         this.leaseCheckDisabled = 
Boolean.valueOf(System.getProperty("oak.documentMK.disableLeaseCheck", 
"false"));
     }
 
+    public void setLeaseCheckDisabled(boolean leaseCheckDisabled) {
+        this.leaseCheckDisabled = leaseCheckDisabled;
+    }
+    
     public int getId() {
         return id;
     }

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1756616&r1=1756615&r2=1756616&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 Wed Aug 17 11:24:52 2016
@@ -454,6 +454,8 @@ public final class DocumentNodeStore
         if (builder.getLeaseCheck()) {
             s = new LeaseCheckDocumentStoreWrapper(s, clusterNodeInfo);
             
clusterNodeInfo.setLeaseFailureHandler(builder.getLeaseFailureHandler());
+        } else {
+            clusterNodeInfo.setLeaseCheckDisabled(true);
         }
 
         this.store = s;