jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r948501 - in /jackrabbit/branches/1.4/jackrabbit-core: ./ src/main/java/org/apache/jackrabbit/core/ src/main/java/org/apache/jackrabbit/core/state/ src/test/java/org/apache/jackrabbit/core/
Date Wed, 26 May 2010 16:51:35 GMT
Author: jukka
Date: Wed May 26 16:51:34 2010
New Revision: 948501

URL: http://svn.apache.org/viewvc?rev=948501&view=rev
Log:
1.4: Merged revision 948500 from the 1.6 branch (JCR-2577)

Added:
    jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentAddRemoveNodeTest.java
      - copied unchanged from r948500, jackrabbit/branches/1.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentAddRemoveNodeTest.java
Modified:
    jackrabbit/branches/1.4/jackrabbit-core/   (props changed)
    jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/   (props
changed)
    jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
    jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java

Propchange: jackrabbit/branches/1.4/jackrabbit-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 26 16:51:34 2010
@@ -1,3 +1,3 @@
 /jackrabbit/branches/1.5/jackrabbit-core:794292
-/jackrabbit/branches/1.6/jackrabbit-core:948488
+/jackrabbit/branches/1.6/jackrabbit-core:948488,948500
 /jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,668086,668147,672125,678788,679389,680135,681031,681287,682409,683268,686688,691181,691550,694164,698200,698209,709142,718981,727402,733080,734366,746932

Propchange: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 26 16:51:34 2010
@@ -1,4 +1,4 @@
 /jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core:794292
-/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core:948488
+/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core:948488,948500
 /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core:653417,654078,654514,655917,656240,656655,656664,658583,668086,668147,672125,678788,679389,680135,681031,681287,682409,683268,686688,691181,691550,694164,698200,698209,709142,718981,727402,733080,734366,746932
 /jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons:760876

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=948501&r1=948500&r2=948501&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Wed May 26 16:51:34 2010
@@ -556,8 +556,6 @@ public class SharedItemStateManager
                  */
                 checkReferentialIntegrity(local);
 
-                checkAddedChildNodes();
-
                 /**
                  * prepare the events. this needs to be after the referential
                  * integrity check, since another transaction could have modified
@@ -674,6 +672,8 @@ public class SharedItemStateManager
                     }
                 }
 
+                checkAddedChildNodes();
+
                 /* create event states */
                 events.createEventStates(rootNodeId, local, SharedItemStateManager.this);
 

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java?rev=948501&r1=948500&r2=948501&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
Wed May 26 16:51:34 2010
@@ -44,6 +44,7 @@ public class TestAll extends TestCase {
         suite.addTestSuite(ConcurrentModificationWithSNSTest.class);
         suite.addTestSuite(ConcurrentMoveTest.class);
         suite.addTestSuite(ConcurrentReorderTest.class);
+        suite.addTestSuite(ConcurrentAddRemoveNodeTest.class);
 
         return suite;
     }



Mime
View raw message