svn commit: r926324 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java test/java/org/apache/jackrabbit/core/ConcurrentAddRemoveNodeTest.java test/java/org/apache/jackrabbit/core/TestAll.java

[mr...@apache.org]

Author: mreutegg
Date: Mon Mar 22 20:42:19 2010
New Revision: 926324

URL: http://svn.apache.org/viewvc?rev=926324&view=rev
Log:
JCR-2577: SISM.checkAddedChildNodes() prevents merging of concurrent changes

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentAddRemoveNodeTest.java   (with props)
Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=926324&r1=926323&r2=926324&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Mon Mar 22 20:42:19 2010
@@ -574,8 +574,6 @@ public class SharedItemStateManager
                     checkReferentialIntegrity();
                 }
 
-                checkAddedChildNodes();
-
                 /**
                  * prepare the events. this needs to be after the referential
                  * integrity check, since another transaction could have modified
@@ -698,6 +696,8 @@ public class SharedItemStateManager
                     }
                 }
 
+                checkAddedChildNodes();
+
                 /* create event states */
                 events.createEventStates(rootNodeId, local, SharedItemStateManager.this);
 

Added: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentAddRemoveNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentAddRemoveNodeTest.java?rev=926324&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentAddRemoveNodeTest.java (added)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentAddRemoveNodeTest.java Mon Mar 22 20:42:19 2010
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.core;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+/**
+ * <code>ConcurrentAddRemoveNodeTest</code> checks if concurrent modifications
+ * on a node are properly handled. Adding and removing distinct child nodes
+ * by separate sessions must succeed.
+ */
+public class ConcurrentAddRemoveNodeTest extends AbstractConcurrencyTest {
+
+    private final AtomicInteger count = new AtomicInteger();
+
+    public void testAddRemove() throws RepositoryException {
+        runTask(new Task() {
+            public void execute(Session session, Node test)
+                    throws RepositoryException {
+                String name = "node-" + count.getAndIncrement();
+                for (int i = 0; i < 10; i++) {
+                    if (test.hasNode(name)) {
+                        test.getNode(name).remove();
+                    } else {
+                        test.addNode(name);
+                    }
+                    session.save();
+                }
+            }
+        }, 10, testRootNode.getPath());
+    }
+}

Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentAddRemoveNodeTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java?rev=926324&r1=926323&r2=926324&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java Mon Mar 22 20:42:19 2010
@@ -56,6 +56,7 @@ public class TestAll extends TestCase {
         suite.addTestSuite(ConcurrentModificationWithSNSTest.class);
         suite.addTestSuite(ConcurrentMoveTest.class);
         suite.addTestSuite(ConcurrentReorderTest.class);
+        suite.addTestSuite(ConcurrentAddRemoveNodeTest.class);
 
         suite.addTestSuite(UserPerWorkspaceSecurityManagerTest.class);