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 2015/08/17 12:12:23 UTC

svn commit: r1696227 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java

Author: stefanegli
Date: Mon Aug 17 10:12:23 2015
New Revision: 1696227

URL: http://svn.apache.org/r1696227
Log:
OAK-2739 : allow clusterNodeInfo to be null

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

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java?rev=1696227&r1=1696226&r2=1696227&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java Mon Aug 17 10:12:23 2015
@@ -47,15 +47,15 @@ public final class LeaseCheckDocumentSto
         if (delegate==null) {
             throw new IllegalArgumentException("delegate must not be null");
         }
-        if (clusterNodeInfo==null) {
-            throw new IllegalArgumentException("clusterNodeInfo must not be null");
-        }
         this.delegate = delegate;
+        // clusterNodeInfo is allowed to be null - eg for testing
         this.clusterNodeInfo = clusterNodeInfo;
     }
     
     private final void performLeaseCheck() {
-        clusterNodeInfo.performLeaseCheck();
+        if (clusterNodeInfo!=null) {
+            clusterNodeInfo.performLeaseCheck();
+        }
     }
     
     @Override