jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From un...@apache.org
Subject svn commit: r1448313 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
Date Wed, 20 Feb 2013 17:31:51 GMT
Author: unico
Date: Wed Feb 20 17:31:51 2013
New Revision: 1448313

URL: http://svn.apache.org/r1448313
Log:
JCR-3525 bundle modcount must be updated before storing, otherwise concurrent changes are
not merged

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java?rev=1448313&r1=1448312&r2=1448313&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
Wed Feb 20 17:31:51 2013
@@ -168,6 +168,7 @@ public class ConsistencyCheckerImpl {
                 if (changes.hasUpdates()) {
                     eventChannel.updatePrepared(update);
                     for (NodePropBundle bundle : bundles.values()) {
+                        bundle.setModCount((short) (bundle.getModCount()+1));
                         storeBundle(bundle);
                     }
                     update.setAttribute(ATTRIBUTE_UPDATE_SIZE, changes.getUpdateSize());



Mime
View raw message