moparisthebest
/
davmail
mirror of https://github.com/moparisthebest/davmail
1
0
Fork 0
Code Issues Releases Wiki Activity

Caldav: improve 404 error handling 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1240 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-07-20 22:35:54 +00:00
parent 03927f53dc
commit 534c129660
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/davmail/caldav/CaldavConnection.java
View File

@ -24,6 +24,7 @@ import davmail.DavGateway;
import davmail.Settings;
import davmail.exception.DavMailAuthenticationException;
import davmail.exception.DavMailException;
import davmail.exception.HttpNotFoundException;
import davmail.exchange.ExchangeSession;
import davmail.exchange.ExchangeSessionFactory;
import davmail.exchange.ICSBufferedReader;
@ -588,7 +589,7 @@ public class CaldavConnection extends AbstractConnection {
if (folder.isContact()) {
contacts = session.getAllContacts(folderPath);
} else {
events = session.getAllEvents(folderPath);
events = session.getAllEvents(folderPath);
if (!folderPath.startsWith("/public")) {
folderList = session.getSubCalendarFolders(folderPath, false);
}
@ -991,7 +992,11 @@ public class CaldavConnection extends AbstractConnection {
if (message == null) {
message = e.toString();
}
sendErr(HttpStatus.SC_SERVICE_UNAVAILABLE, message);
if (e instanceof HttpNotFoundException) {
sendErr(HttpStatus.SC_NOT_FOUND, message);
} else {
sendErr(HttpStatus.SC_SERVICE_UNAVAILABLE, message);
}
}
/**
@ -1306,7 +1311,7 @@ public class CaldavConnection extends AbstractConnection {
}
protected boolean isBrokenHrefEncoding() {
return isUserAgent("DAVKit/3") || isUserAgent("eM Client/")|| isUserAgent("Lightning/1.0b2");
return isUserAgent("DAVKit/3") || isUserAgent("eM Client/") || isUserAgent("Lightning/1.0b2");
}
protected boolean isLightning() {
@ -1432,7 +1437,7 @@ public class CaldavConnection extends AbstractConnection {
* @param subFolder sub folder path
* @return folder path
*/
public String getFolderPath(String subFolder) {
public String getFolderPath(String subFolder) {
int endIndex;
if (isFolder()) {
endIndex = getPathLength();