svn commit: r1853862 - in /jackrabbit/oak/trunk/oak-store-document/src: main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java

[mreutegg]

Author: mreutegg
Date: Tue Feb 19 08:08:37 2019
New Revision: 1853862

URL: http://svn.apache.org/viewvc?rev=1853862&view=rev
Log:
OAK-8060: Incorrect read preference when parentId refers to NodeDocument.NULL

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1853862&r1=1853861&r2=1853862&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
 Tue Feb 19 08:08:37 2019
@@ -1457,7 +1457,7 @@ public class MongoDocumentStore implemen
                     } else {
                         //If parent has been modified loooong time back then 
there children
                         //would also have not be modified. In that case we can 
read from secondary
-                        NodeDocument cachedDoc = 
nodesCache.getIfPresent(parentId);
+                        NodeDocument cachedDoc = getIfCached(Collection.NODES, 
parentId);
                         secondarySafe = cachedDoc != null && 
!cachedDoc.hasBeenModifiedSince(replicationSafeLimit);
                     }
                 }

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java?rev=1853862&r1=1853861&r2=1853862&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java
 Tue Feb 19 08:08:37 2019
@@ -28,7 +28,6 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
@@ -128,7 +127,6 @@ public class ReadPreferenceIT extends Ab
         assertEquals(ReadPreference.secondary(), 
mongoDS.getConfiguredReadPreference(NODES));
     }
 
-    @Ignore("OAK-8060")
     @Test
     public void getMongoReadPreference() {
         String id = getIdFromPath("/does/not/exist");