svn commit: r1799310 - /jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java

[tomekr]

Author: tomekr
Date: Tue Jun 20 07:32:56 2017
New Revision: 1799310

URL: http://svn.apache.org/viewvc?rev=1799310&view=rev
Log:
OAK-6360: Failed to retrieve previously indexed checkpoint in composite node 
store

Don't use the resolve-by-name mechanism for releasing checkpoints
from the partial stores.

Modified:
    
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java

Modified: 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java?rev=1799310&r1=1799309&r2=1799310&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
 Tue Jun 20 07:32:56 2017
@@ -348,14 +348,16 @@ public class CompositeNodeStore implemen
             return globalCheckpoint;
         }
 
-        String nameProp = globalCheckpointProperties.get("name");
-        if (nameProp == null) {
-            return null;
-        }
-        for (String c : validCheckpointNames) {
-            Map<String, String> partialCheckpointProperties = 
nodeStore.getNodeStore().checkpointInfo(c);
-            if (nameProp.equals(partialCheckpointProperties.get("name"))) {
-                return c;
+        if (resolveByName) {
+            String nameProp = globalCheckpointProperties.get("name");
+            if (nameProp == null) {
+                return null;
+            }
+            for (String c : validCheckpointNames) {
+                Map<String, String> partialCheckpointProperties = 
nodeStore.getNodeStore().checkpointInfo(c);
+                if (nameProp.equals(partialCheckpointProperties.get("name"))) {
+                    return c;
+                }
             }
         }
         return null;