svn commit: r1680236 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java

[chetanm]

Author: chetanm
Date: Tue May 19 10:31:37 2015
New Revision: 1680236

URL: http://svn.apache.org/r1680236
Log:
OAK-2890 - SegmentBlob does not return blobId for contentIdentity

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java?rev=1680236&r1=1680235&r2=1680236&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java
 Tue May 19 10:31:37 2015
@@ -139,6 +139,10 @@ public class SegmentBlob extends Record
 
     @Override
     public String getContentIdentity() {
+        String blobId = getBlobId();
+        if (blobId != null){
+            return blobId;
+        }
         return getRecordId().toString();
     }
 

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java?rev=1680236&r1=1680235&r2=1680236&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java
 Tue May 19 10:31:37 2015
@@ -79,6 +79,8 @@ public class ExternalBlobTest {
         Blob b2 = testCreateAndRead(nodeStore.createBlob(new 
ByteArrayInputStream(data2)));
         assertTrue(b2 instanceof SegmentBlob);
         assertNotNull(b2.getReference());
+        assertEquals(b2.getContentIdentity(), ((SegmentBlob) b2).getBlobId());
+
         InputStream is = dbs.getInputStream(((SegmentBlob) b2).getBlobId());
         assertNotNull(IOUtils.contentEquals(new ByteArrayInputStream(data2), 
is));
         is.close();