You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2013/10/18 23:23:06 UTC

svn commit: r1533639 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsonSerializer.java

Author: jukka
Date: Fri Oct 18 21:23:06 2013
New Revision: 1533639

URL: http://svn.apache.org/r1533639
Log:
OAK-987: Implement the MicroKernel API

Correct use of the new BlobSerializer class

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsonSerializer.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsonSerializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsonSerializer.java?rev=1533639&r1=1533638&r2=1533639&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsonSerializer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsonSerializer.java Fri Oct 18 21:23:06 2013
@@ -75,10 +75,6 @@ class JsonSerializer {
                 includeChildNodeCount, blobs);
     }
 
-    protected String getBlobId(Blob blob) {
-        return AbstractBlob.calculateSha256(blob).toString();
-    }
-
     void serialize(NodeState node) {
         json.object();
 
@@ -141,7 +137,7 @@ class JsonSerializer {
             json.value(property.getValue(LONG, index).longValue());
         } else if (type == BINARY) {
             Blob blob = property.getValue(BINARY, index);
-            json.value(TypeCodes.encode(type.tag(), getBlobId(blob)));
+            json.value(TypeCodes.encode(type.tag(), blobs.serialize(blob)));
         } else  {
             String value = property.getValue(STRING, index);
             if (type != STRING || TypeCodes.split(value) != -1) {