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 2017/10/20 14:50:14 UTC
svn commit: r1812753 -
/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
Author: reschke
Date: Fri Oct 20 14:50:14 2017
New Revision: 1812753
URL: http://svn.apache.org/viewvc?rev=1812753&view=rev
Log:
OAK-6852: RDBDocumentStore conditional remove: check key to be a non-revision property
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1812753&r1=1812752&r2=1812753&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java Fri Oct 20 14:50:14 2017
@@ -207,7 +207,8 @@ public class RDBDocumentStoreJDBC {
throw new DocumentStoreException("Unsupported number of conditions in : " + entry.getValue().entrySet());
}
Entry<Key, Condition> c = entry.getValue().entrySet().iterator().next();
- if (!c.getKey().getName().equals(MODIFIED) || c.getValue().type != Condition.Type.EQUALS) {
+ if (!c.getKey().getName().equals(MODIFIED) || c.getKey().getRevision() != null
+ || c.getValue().type != Condition.Type.EQUALS) {
throw new DocumentStoreException("Unsupported condition: " + c);
}
}