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

Improve item not found logging 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1043 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-05-12 09:16:20 +00:00
parent b17035afb2
commit 2f28151a64
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/davmail/exchange/ExchangeSession.java
View File

@ -23,7 +23,6 @@ import davmail.Settings;
import davmail.exception.DavMailAuthenticationException; import davmail.exception.DavMailAuthenticationException;
import davmail.exception.DavMailException; import davmail.exception.DavMailException;
import davmail.exception.HttpNotFoundException; import davmail.exception.HttpNotFoundException;
import davmail.exception.HttpServerErrorException;
import davmail.http.DavGatewayHttpClientFacade; import davmail.http.DavGatewayHttpClientFacade;
import davmail.http.DavGatewayOTPPrompt; import davmail.http.DavGatewayOTPPrompt;
import davmail.util.StringUtil; import davmail.util.StringUtil;
@ -3091,12 +3090,14 @@ public class ExchangeSession {
* @throws IOException on error * @throws IOException on error
*/ */
public Item getItem(String folderPath, String itemName) throws IOException { public Item getItem(String folderPath, String itemName) throws IOException {
String itemPath = folderPath + '/' + convertItemNameToEML(itemName);
Item item; Item item;
try { try {
item = getItem(folderPath + '/' + convertItemNameToEML(itemName)); item = getItem(itemPath);
} catch (HttpNotFoundException hnfe) { } catch (HttpNotFoundException hnfe) {
// failover for Exchange 2007 plus encoding issue // failover for Exchange 2007 plus encoding issue
String decodedEventName = convertItemNameToEML(itemName).replaceAll("_xF8FF_", "/").replaceAll("_x003F_", "?").replaceAll("'", "''"); String decodedEventName = convertItemNameToEML(itemName).replaceAll("_xF8FF_", "/").replaceAll("_x003F_", "?").replaceAll("'", "''");
LOGGER.debug("Item not found at "+itemPath+", search by displayname: '"+decodedEventName+ '\'');
ExchangeSession.MessageList messages = searchMessages(folderPath, " AND \"DAV:displayname\"='" + decodedEventName + '\''); ExchangeSession.MessageList messages = searchMessages(folderPath, " AND \"DAV:displayname\"='" + decodedEventName + '\'');
if (!messages.isEmpty()) { if (!messages.isEmpty()) {
item = getItem(messages.get(0).getPermanentUrl()); item = getItem(messages.get(0).getPermanentUrl());