moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-13 19:22:22 -05:00
Code Issues Releases Wiki Activity

Dav: back to old path in Destination header behavior

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1684 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2011-05-16 09:43:41 +00:00
parent a0f075c632
commit fa536e0824
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/davmail/exchange/dav/DavExchangeSession.java
View File

@ -1697,7 +1697,7 @@ public class DavExchangeSession extends ExchangeSession {
@Override @Override
public void moveItem(String sourcePath, String targetPath) throws IOException { public void moveItem(String sourcePath, String targetPath) throws IOException {
MoveMethod method = new MoveMethod(URIUtil.encodePath(getFolderPath(sourcePath)), MoveMethod method = new MoveMethod(URIUtil.encodePath(getFolderPath(sourcePath)),
getEscapedUrlFromPath(URIUtil.encodePath(getFolderPath(targetPath))), false); URIUtil.encodePath(getFolderPath(targetPath)), false);
try { try {
int statusCode = httpClient.executeMethod(method); int statusCode = httpClient.executeMethod(method);
if (statusCode == HttpStatus.SC_PRECONDITION_FAILED) { if (statusCode == HttpStatus.SC_PRECONDITION_FAILED) {
@ -2537,9 +2537,9 @@ public class DavExchangeSession extends ExchangeSession {
return baos.toByteArray(); return baos.toByteArray();
} }
protected String getEscapedUrlFromPath(String escapdePath) throws URIException { protected String getEscapedUrlFromPath(String escapedPath) throws URIException {
URI uri = new URI(httpClient.getHostConfiguration().getHostURL(), true); URI uri = new URI(httpClient.getHostConfiguration().getHostURL(), true);
uri.setEscapedPath(escapdePath); uri.setEscapedPath(escapedPath);
return uri.getEscapedURI(); return uri.getEscapedURI();
} }
@ -2611,8 +2611,7 @@ public class DavExchangeSession extends ExchangeSession {
protected void copyMessage(String sourceUrl, String targetFolder) throws IOException { protected void copyMessage(String sourceUrl, String targetFolder) throws IOException {
String targetPath = URIUtil.encodePath(getFolderPath(targetFolder)) + '/' + UUID.randomUUID().toString(); String targetPath = URIUtil.encodePath(getFolderPath(targetFolder)) + '/' + UUID.randomUUID().toString();
String targetUri = getEscapedUrlFromPath(targetPath); CopyMethod method = new CopyMethod(URIUtil.encodePath(sourceUrl), targetPath, false);
CopyMethod method = new CopyMethod(URIUtil.encodePath(sourceUrl), targetUri, false);
// allow rename if a message with the same name exists // allow rename if a message with the same name exists
method.addRequestHeader("Allow-Rename", "t"); method.addRequestHeader("Allow-Rename", "t");
try { try {