You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by un...@apache.org on 2013/01/28 09:23:29 UTC
svn commit: r1439296 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Author: unico
Date: Mon Jan 28 08:23:29 2013
New Revision: 1439296
URL: http://svn.apache.org/viewvc?rev=1439296&view=rev
Log:
JCR-3501 reset modcount of modified states when cancelling an update
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.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=1439296&r1=1439295&r2=1439296&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 Jan 28 08:23:29 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();
}