mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-19 06:32:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed webdav copy/move [ci skip]

Browse Source
This commit is contained in:
Sebastian Stenzel
2016-02-14 00:26:47 +01:00
parent f0cb91b22f
commit cf64a6c425
14 changed files with 97 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFolder.java
+11 -8
View File
@@ -147,15 +147,20 @@ class DavFolder extends DavNode<FolderLocator> {
@Override
public void copy(DavResource destination, boolean shallow) throws DavException {
if (destination instanceof DavFolder) {
DavFolder dst = (DavFolder) destination;
if (dst.node.exists()) {
dst.node.delete();
} else if (!dst.node.parent().get().exists()) {
if (!node.exists()) {
throw new DavException(DavServletResponse.SC_NOT_FOUND);
}
if (destination instanceof DavNode) {
DavNode<?> dst = (DavNode<?>) destination;
if (!dst.node.parent().get().exists()) {
throw new DavException(DavServletResponse.SC_CONFLICT, "Destination's parent doesn't exist.");
}
dst.node.create();
}
if (destination instanceof DavFolder) {
DavFolder dst = (DavFolder) destination;
if (shallow) {
// create destination, if it doesn't exist yet:
dst.node.create();
// http://www.webdav.org/specs/rfc2518.html#copy.for.collections
node.creationTime().ifPresent(dst::setCreationTime);
dst.setModificationTime(node.lastModified());
@@ -168,8 +173,6 @@ class DavFolder extends DavNode<FolderLocator> {
Folder newDst = parent.folder(dst.node.name());
if (dst.node.exists()) {
dst.node.delete();
} else if (!parent.exists()) {
throw new DavException(DavServletResponse.SC_CONFLICT, "Destination's parent doesn't exist.");
}
node.copyTo(newDst);
} else {