svn commit: r1729165 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java

[mreutegg]

Author: mreutegg
Date: Mon Feb  8 13:15:21 2016
New Revision: 1729165

URL: http://svn.apache.org/viewvc?rev=1729165&view=rev
Log:
OAK-3995: Incorrect translation of old checkpoint format

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

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java?rev=1729165&r1=1729164&r2=1729165&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
 Mon Feb  8 13:15:21 2016
@@ -228,7 +228,7 @@ class Checkpoints {
         for (Revision r : head) {
             int cId = r.getClusterId();
             if (cId == checkpoint.getClusterId()) {
-                revs.put(cId, r);
+                revs.put(cId, checkpoint);
             } else {
                 revs.put(cId, new Revision(checkpoint.getTimestamp(), 0, cId));
             }

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java?rev=1729165&r1=1729164&r2=1729165&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java
 Mon Feb  8 13:15:21 2016
@@ -29,7 +29,6 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -353,7 +352,6 @@ public class CheckpointsTest {
         assertFalse(root.hasChildNode("baz"));
     }
 
-    @Ignore("OAK-3995")
     @Test
     public void sameClusterReadOldCheckpoint() throws Exception {
         DocumentStore store = new MemoryDocumentStore();