svn commit: r1769038 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java

[chetanm]

Author: chetanm
Date: Thu Nov 10 05:35:44 2016
New Revision: 1769038

URL: http://svn.apache.org/viewvc?rev=1769038&view=rev
Log:
OAK-5088 - o.a.j.o.p.b.d.DataStoreBlobStore#getReference logs WARNING for 
missing records

Applied patch from Timothee Maret

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java?rev=1769038&r1=1769037&r2=1769038&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
 Thu Nov 10 05:35:44 2016
@@ -290,7 +290,7 @@ public class DataStoreBlobStore implemen
 
         DataRecord record;
         try {
-            record = delegate.getRecord(new DataIdentifier(blobId));
+            record = delegate.getRecordIfStored(new DataIdentifier(blobId));
             if (record != null) {
                 return record.getReference();
             } else {

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java?rev=1769038&r1=1769037&r2=1769038&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java
 Thu Nov 10 05:35:44 2016
@@ -146,6 +146,7 @@ public class DataStoreBlobStoreTest exte
         DataStore mockedDS = mock(DataStore.class);
         when(mockedDS.getRecordFromReference(reference)).thenReturn(testDR);
         when(mockedDS.getRecord(testDI)).thenReturn(testDR);
+        when(mockedDS.getRecordIfStored(testDI)).thenReturn(testDR);
         DataStoreBlobStore ds = new DataStoreBlobStore(mockedDS);
 
         assertEquals(reference,ds.getReference(blobId));