svn commit: r660415 - /incubator/sling/trunk/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/ModifyOperation.java

[fmeschbe]

Author: fmeschbe
Date: Tue May 27 00:36:24 2008
New Revision: 660415

URL: http://svn.apache.org/viewvc?rev=660415&view=rev
Log:
SLING-474 Move @Delete handling after @Move/CopyFrom handling and ensure the
moved/copied property is not removed after a successfull move/copy.

Modified:
    
incubator/sling/trunk/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/ModifyOperation.java

Modified: 
incubator/sling/trunk/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/ModifyOperation.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/ModifyOperation.java?rev=660415&r1=660414&r2=660415&view=diff
==============================================================================
--- 
incubator/sling/trunk/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/ModifyOperation.java
 (original)
+++ 
incubator/sling/trunk/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/ModifyOperation.java
 Tue May 27 00:36:24 2008
@@ -86,13 +86,13 @@
         // ensure root of new content
         processCreate(session, reqProperties, response);
 
-        // cleanup any old content (@Delete parameters)
-        processDeletes(session, reqProperties, response);
-
         // write content from existing content (@Move/CopyFrom parameters)
         processMoves(session, reqProperties, response);
         processCopies(session, reqProperties, response);
 
+        // cleanup any old content (@Delete parameters)
+        processDeletes(session, reqProperties, response);
+
         // write content from form
         writeContent(session, reqProperties, response);
 
@@ -319,6 +319,10 @@
                 }
             }
 
+            // make sure the property is not deleted even in case for a given
+            // property both @MoveFrom and @Delete is set
+            property.setDelete(false);
+            
             // record successful move
             if (isMove) {
                 response.onMoved(source, propPath);