jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sch...@apache.org
Subject svn commit: r1311861 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/ItemSaveOperation.java test/java/org/apache/jackrabbit/core/MoveRemoveTest.java
Date Tue, 10 Apr 2012 16:49:30 GMT
Author: schans
Date: Tue Apr 10 16:49:30 2012
New Revision: 1311861

URL: http://svn.apache.org/viewvc?rev=1311861&view=rev
Log:
JCR-3289: Fix data inconsistency when remove operation is performed after move operation

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveRemoveTest.java
  (with props)
Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemSaveOperation.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemSaveOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemSaveOperation.java?rev=1311861&r1=1311860&r2=1311861&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemSaveOperation.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemSaveOperation.java
Tue Apr 10 16:49:30 2012
@@ -712,13 +712,16 @@ class ItemSaveOperation implements Sessi
      * definitively remove each one
      */
     private void removeTransientItems(
-            SessionItemStateManager sism, Iterable<ItemState> states) {
+            SessionItemStateManager sism, Iterable<ItemState> states) throws StaleItemStateException
{
         for (ItemState transientState : states) {
             ItemState persistentState = transientState.getOverlayedState();
             // remove persistent state
             // this will indirectly (through stateDestroyed listener method)
             // permanently invalidate all Item instances wrapping it
             assert persistentState != null;
+            if (transientState.getModCount() != persistentState.getModCount()) {
+                throw new StaleItemStateException(transientState.getId() + " has been modified
externally");
+            }
             sism.destroy(persistentState);
         }
     }

Added: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveRemoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveRemoveTest.java?rev=1311861&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveRemoveTest.java
(added)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveRemoveTest.java
Tue Apr 10 16:49:30 2012
@@ -0,0 +1,64 @@
+/*
+ * 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 javax.jcr.InvalidItemStateException;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.jackrabbit.core.persistence.check.ConsistencyReport;
+import org.apache.jackrabbit.core.state.StaleItemStateException;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+
+public class MoveRemoveTest extends AbstractJCRTest {
+
+    private String folder1Path;
+    private String folder2Path;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        Node folder1 = testRootNode.addNode("folder1");
+        folder1Path = folder1.getPath();
+        Node folder2 = testRootNode.addNode("folder2");
+        folder2Path = folder2.getPath();
+        folder1.addNode("node");
+        testRootNode.getSession().save();
+    }
+
+    public void testMoveRemove() throws RepositoryException, NotExecutableException {
+        Session session1 = getHelper().getSuperuserSession();
+        Session session2 = getHelper().getSuperuserSession();
+        session1.move(folder1Path + "/node", folder2Path + "/node");
+        session2.getNode(folder1Path + "/node").remove();
+        session1.save();
+        try {
+            session2.save();
+        } catch (InvalidItemStateException e) {
+            if (e.getCause() == null || e.getCause().getClass() != StaleItemStateException.class)
{
+                throw e;
+            }
+        }
+        ConsistencyReport consistencyReport = TestHelper.checkConsistency(testRootNode.getSession(),
false, null);
+        //for (ReportItem item : consistencyReport.getItems()) {
+        //    System.out.println(item.getMessage());
+        //}
+        assertTrue(consistencyReport.getItems().size() == 0);
+    }
+}

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

Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveRemoveTest.java
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message