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 2014/04/30 20:27:13 UTC

svn commit: r1591439 - in /jackrabbit/oak/branches/1.0: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java oak-parent/pom.xml

Author: jukka
Date: Wed Apr 30 18:27:12 2014
New Revision: 1591439

URL: http://svn.apache.org/r1591439
Log:
1.0: Merged revision 1591438 (OAK-1748)

Modified:
    jackrabbit/oak/branches/1.0/   (props changed)
    jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java
    jackrabbit/oak/branches/1.0/oak-parent/pom.xml

Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1591438

Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java?rev=1591439&r1=1591438&r2=1591439&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreWrapperBackend.java Wed Apr 30 18:27:12 2014
@@ -24,9 +24,10 @@ import java.util.Iterator;
 import java.util.Set;
 
 import com.google.common.collect.Sets;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.jackrabbit.core.data.AsyncUploadCallback;
-import org.apache.jackrabbit.core.data.AsyncUploadCallback.RESULT;
+import org.apache.jackrabbit.core.data.AsyncUploadResult;
 import org.apache.jackrabbit.core.data.Backend;
 import org.apache.jackrabbit.core.data.CachingDataStore;
 import org.apache.jackrabbit.core.data.DataIdentifier;
@@ -75,7 +76,8 @@ public class DataStoreWrapperBackend imp
     @Override
     public void writeAsync(DataIdentifier dataIdentifier, File file,
             AsyncUploadCallback asyncUploadCallback) throws DataStoreException {
-        asyncUploadCallback.call(dataIdentifier, file, RESULT.FAILED);
+        asyncUploadCallback.onFailure(
+                new AsyncUploadResult(dataIdentifier, file));
     }
 
     @Override

Modified: jackrabbit/oak/branches/1.0/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-parent/pom.xml?rev=1591439&r1=1591438&r2=1591439&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-parent/pom.xml Wed Apr 30 18:27:12 2014
@@ -41,7 +41,7 @@
     <project.reporting.outputEncoding>
       ${project.build.sourceEncoding}
     </project.reporting.outputEncoding>
-    <jackrabbit.version>2.7.5</jackrabbit.version>
+    <jackrabbit.version>2.8-SNAPSHOT</jackrabbit.version>
     <mongo.host>127.0.0.1</mongo.host>
     <mongo.port>27017</mongo.port>
     <mongo.db>MongoMKDB</mongo.db>