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 mr...@apache.org on 2015/10/29 10:52:34 UTC
svn commit: r1711207 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Author: mreutegg
Date: Thu Oct 29 09:52:34 2015
New Revision: 1711207
URL: http://svn.apache.org/viewvc?rev=1711207&view=rev
Log:
OAK-3565: Use DocumentStore.create() for new previous documents
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1711207&r1=1711206&r2=1711207&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Thu Oct 29 09:52:34 2015
@@ -1994,7 +1994,11 @@ public final class DocumentNodeStore
continue;
}
for (UpdateOp op : doc.split(this, head)) {
- NodeDocument before = store.createOrUpdate(Collection.NODES, op);
+ NodeDocument before = null;
+ if (!op.isNew() ||
+ !store.create(Collection.NODES, Collections.singletonList(op))) {
+ before = store.createOrUpdate(Collection.NODES, op);
+ }
if (before != null) {
if (LOG.isDebugEnabled()) {
NodeDocument after = store.find(Collection.NODES, op.getId());