Same fix as previously made in commit 1a81b3a781: Deleting a DAV resource implicitly unlocks it.

This commit is contained in:
Sebastian Stenzel
2016-02-28 16:21:59 +01:00
parent 2ae5abfc0a
commit be7e7e32b9

View File

@@ -26,6 +26,7 @@ import org.apache.jackrabbit.webdav.DavServletResponse;
import org.apache.jackrabbit.webdav.DavSession;
import org.apache.jackrabbit.webdav.io.InputContext;
import org.apache.jackrabbit.webdav.io.OutputContext;
import org.apache.jackrabbit.webdav.lock.ActiveLock;
import org.apache.jackrabbit.webdav.lock.LockManager;
import org.apache.jackrabbit.webdav.property.DavProperty;
import org.apache.jackrabbit.webdav.property.DavPropertyName;
@@ -102,6 +103,9 @@ class DavFolder extends DavNode<FolderLocator> {
@Override
public void removeMember(DavResource member) throws DavException {
for (ActiveLock lock : member.getLocks()) {
member.unlock(lock.getToken());
}
final Node child = getMemberNode(member.getDisplayName());
child.delete();
}