svn commit: r1730581 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java

[reschke]

Author: reschke
Date: Mon Feb 15 17:51:55 2016
New Revision: 1730581

URL: http://svn.apache.org/viewvc?rev=1730581&view=rev
Log:
OAK-4021: RDBDocumentStore: fix return value for create() on collections other 
than NODES

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.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=1730581&r1=1730580&r2=1730581&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
 Mon Feb 15 17:51:55 2016
@@ -1159,12 +1159,13 @@ public class RDBDocumentStore implements
                     docs.add(doc);
                 }
                 boolean done = insertDocuments(collection, docs);
-                if (done && collection == Collection.NODES) {
-                    for (T doc : docs) {
-                        nodesCache.putIfAbsent((NodeDocument) doc);
+                if (done) {
+                    if (collection == Collection.NODES) {
+                        for (T doc : docs) {
+                            nodesCache.putIfAbsent((NodeDocument) doc);
+                        }
                     }
-                }
-                else {
+                } else {
                     success = false;
                 }
             }

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java?rev=1730581&r1=1730580&r2=1730581&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
 Mon Feb 15 17:51:55 2016
@@ -68,6 +68,23 @@ public class BasicDocumentStoreTest exte
     }
 
     @Test
+    public void testAddAndRemoveJournalEntry() {
+        // OAK-4021
+        String id = this.getClass().getName() + 
".testAddAndRemoveJournalEntry";
+
+        // remove if present
+        Document d = super.ds.find(Collection.JOURNAL, id);
+        if (d != null) {
+            super.ds.remove(Collection.JOURNAL, id);
+        }
+
+        // add
+        UpdateOp up = new UpdateOp(id, true);
+        up.set("_id", id);
+        assertTrue(super.ds.create(Collection.JOURNAL, 
Collections.singletonList(up)));
+    }
+
+    @Test
     public void testConditionalUpdate() {
         String id = this.getClass().getName() + ".testConditionalUpdate";