svn commit: r1596850 - in /jackrabbit/oak/branches/1.0/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/ test/java/org/apache/jackrabbit/oak/plugins/document/

[mr...@apache.org]

Author: mreutegg
Date: Thu May 22 12:57:58 2014
New Revision: 1596850

URL: http://svn.apache.org/r1596850
Log:
OAK-1827: ClassCastException in NodeDocument.split() when collisions detected

Added:
    jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
      - copied unchanged from r1596844, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
Modified:
    jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
    jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
    jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java

Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java?rev=1596850&r1=1596849&r2=1596850&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java Thu May 22 12:57:58 2014
@@ -127,7 +127,7 @@ class Collision {
         if (commitRoot.isCommitted(revision)) {
             return false;
         }
-        op.setMapEntry(NodeDocument.COLLISIONS, revision, true);
+        NodeDocument.addCollision(op, revision);
         commitRoot = store.createOrUpdate(Collection.NODES, op);
         // check again on old document right before our update was applied
         if (commitRoot.isCommitted(revision)) {

Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1596850&r1=1596849&r2=1596850&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java Thu May 22 12:57:58 2014
@@ -278,7 +278,7 @@ public final class NodeDocument extends 
      */
     private static final Set<String> IGNORE_ON_SPLIT = ImmutableSet.of(
             ID, MOD_COUNT, MODIFIED_IN_SECS, PREVIOUS, LAST_REV, CHILDREN_FLAG,
-            HAS_BINARY_FLAG, PATH, DELETED_ONCE);
+            HAS_BINARY_FLAG, PATH, DELETED_ONCE, COLLISIONS);
 
     public static final long HAS_BINARY_VAL = 1;
 
@@ -1210,6 +1210,12 @@ public final class NodeDocument extends 
         checkNotNull(op).removeMapEntry(REVISIONS, checkNotNull(revision));
     }
 
+    public static void addCollision(@Nonnull UpdateOp op,
+                                    @Nonnull Revision revision) {
+        checkNotNull(op).setMapEntry(COLLISIONS, checkNotNull(revision),
+                String.valueOf(true));
+    }
+
     public static void removeCollision(@Nonnull UpdateOp op,
                                        @Nonnull Revision revision) {
         checkNotNull(op).removeMapEntry(COLLISIONS, checkNotNull(revision));

Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java?rev=1596850&r1=1596849&r2=1596850&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java Thu May 22 12:57:58 2014
@@ -130,7 +130,7 @@ public final class UpdateOp {
      * @param revision the revision
      * @param value the value
      */
-    void setMapEntry(@Nonnull String property, @Nonnull Revision revision, Object value) {
+    void setMapEntry(@Nonnull String property, @Nonnull Revision revision, String value) {
         Operation op = new Operation();
         op.type = Operation.Type.SET_MAP_ENTRY;
         op.value = value;