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

[mreutegg]

Author: mreutegg
Date: Mon Jul  7 13:41:40 2014
New Revision: 1608463

URL: http://svn.apache.org/r1608463
Log:
OAK-1953: Oak console on MongoMK fails with NPE

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

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java?rev=1608463&r1=1608462&r2=1608463&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
 Mon Jul  7 13:41:40 2014
@@ -78,11 +78,11 @@ public class LastRevRecoveryAgent {
         final long asyncDelay = nodeStore.getAsyncDelay();
 
         if (nodeInfo != null) {
-            long leaseEnd = nodeInfo.getLeaseEndTime();
-
             // Check if _lastRev recovery needed for this cluster node
             // state is Active && recoveryLock not held by someone
-            if (isRecoveryNeeded(nodeInfo)) {            
+            if (isRecoveryNeeded(nodeInfo)) {
+                long leaseEnd = nodeInfo.getLeaseEndTime();
+
                 // retrieve the root document's _lastRev
                 NodeDocument root = missingLastRevUtil.getRoot();
                 Revision lastRev = root.getLastRev().get(clusterId);