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 re...@apache.org on 2014/03/20 15:22:24 UTC

svn commit: r1579636 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Author: reschke
Date: Thu Mar 20 14:22:23 2014
New Revision: 1579636

URL: http://svn.apache.org/r1579636
Log:
OAK-1266 - fix return value for findAndUpdate on non-existing document

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1579636&r1=1579635&r2=1579636&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Thu Mar 20 14:22:23 2014
@@ -299,7 +299,9 @@ public class RDBDocumentStore implements
         T oldDoc = readDocument(collection, update.getId());
 
         if (oldDoc == null) {
-            if (!update.isNew() || !allowCreate) {
+            if (!allowCreate) {
+                return null;
+            } else if (!update.isNew()) {
                 throw new MicroKernelException("Document does not exist: " + update.getId());
             }
             T doc = collection.newDocument(this);