Author: unico
Date: Mon Jan 28 08:26:08 2013
New Revision: 1439297

URL: http://svn.apache.org/viewvc?rev=1439297&view=rev
Log:
JCR-3501 reset modcount of modified states when cancelling an update

Modified:
    jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java

Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=1439297&r1=1439296&r2=1439297&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Mon Jan 28 08:26:08 2013
@@ -868,14 +868,14 @@ public class SharedItemStateManager
 
                 for (ItemState state : shared.modifiedStates()) {
                     try {
-                        state.copy(loadItemState(state.getId()), false);
+                        state.copy(loadItemState(state.getId()), true);
                     } catch (ItemStateException e) {
                         state.discard();
                     }
                 }
                 for (ItemState state : shared.deletedStates()) {
                     try {
-                        state.copy(loadItemState(state.getId()), false);
+                        state.copy(loadItemState(state.getId()), true);
                     } catch (ItemStateException e) {
                         state.discard();
                     }