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

Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2006/05/26 04:13:58 UTC

svn commit: r409539 - /jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java

Author: jukka
Date: Thu May 25 19:13:58 2006
New Revision: 409539

URL: http://svn.apache.org/viewvc?rev=409539&view=rev
Log:
1.0: Merged revision 393731: JCR-391

Modified:
    jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java

Modified: jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java?rev=409539&r1=409538&r2=409539&view=diff
==============================================================================
--- jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java (original)
+++ jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java Thu May 25 19:13:58 2006
@@ -619,8 +619,10 @@
         if (isFilteredResource(destination)) {
             throw new DavException(DavServletResponse.SC_FORBIDDEN);
         }
-        // TODO: support shallow and deep copy
-        if (shallow) {
+        if (shallow && isCollection()) {
+            // TODO: currently no support for shallow copy; however this is
+            // only relevant if the source resource is a collection, because
+            // otherwise it doesn't make a difference
             throw new DavException(DavServletResponse.SC_FORBIDDEN, "Unable to perform shallow copy.");
         }
         try {