You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by st...@apache.org on 2008/03/03 18:12:34 UTC

svn commit: r633179 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java

Author: stefan
Date: Mon Mar  3 09:12:33 2008
New Revision: 633179

URL: http://svn.apache.org/viewvc?rev=633179&view=rev
Log:
JCR-1432: Saving a node deletion that has been modified externally throws a ConstraintViolationException

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java?rev=633179&r1=633178&r2=633179&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java Mon Mar  3 09:12:33 2008
@@ -825,6 +825,12 @@
                 transientState.setStatus(ItemState.STATUS_STALE_MODIFIED);
                 visibleState = transientState;
             }
+            // check attic as well (JCR-1432)
+            transientState = atticStore.get(modified.getId());
+            if (transientState != null) {
+                transientState.setStatus(ItemState.STATUS_STALE_MODIFIED);
+                visibleState = transientState;
+            }
         }
         dispatcher.notifyStateModified(visibleState);
     }