jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r961388 - /jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Date Wed, 07 Jul 2010 14:27:30 GMT
Author: stefan
Date: Wed Jul  7 14:27:30 2010
New Revision: 961388

URL: http://svn.apache.org/viewvc?rev=961388&view=rev
Log:
JCR-2668: NodeReferences are lost when deleting and setting the same reference in the same
save() cycle

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

Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=961388&r1=961387&r2=961388&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
(original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Wed Jul  7 14:27:30 2010
@@ -893,7 +893,9 @@ public class SharedItemStateManager
                 ItemState state = (ItemState) i.next();
                 if (!state.isNode()) {
                     // remove refs from the target which have been added externally (JCR-2138)
-                    if (hasItemState(state.getId())) {
+                    if (hasItemState(state.getId())
+                            // JCR-2667
+                            && !local.deleted(state.getId())) {
                         removeReferences(getItemState(state.getId()));
                     }
                     // add new references to the target



Mime
View raw message