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

Caldav: use rebuild event from MAPI properties failover in all error cases

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1549 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-11-22 09:37:56 +00:00
parent dd648bbf54
commit e07438a445
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1305,11 +1305,11 @@ public class DavExchangeSession extends ExchangeSession {
} }
} }
} catch (DavException e) { } catch (DavException e) {
throw buildHttpException(e); LOGGER.warn(e.getMessage());
} catch (IOException e) { } catch (IOException e) {
LOGGER.warn(e.getMessage()); LOGGER.warn(e.getMessage());
} catch (MessagingException e) { } catch (MessagingException e) {
throw buildHttpException(e); LOGGER.warn(e.getMessage());
} }
// failover: rebuild event from MAPI properties // failover: rebuild event from MAPI properties
@ -2371,15 +2371,15 @@ public class DavExchangeSession extends ExchangeSession {
} }
} }
protected static final long MAPI_SEND_NO_RICH_INFO = 0x00010000L; //protected static final long MAPI_SEND_NO_RICH_INFO = 0x00010000L;
protected static final long ENCODING_PREFERENCE = 0x00020000L; protected static final long ENCODING_PREFERENCE = 0x00020000L;
protected static final long ENCODING_MIME = 0x00040000L; protected static final long ENCODING_MIME = 0x00040000L;
protected static final long BODY_ENCODING_HTML = 0x00080000L; //protected static final long BODY_ENCODING_HTML = 0x00080000L;
protected static final long BODY_ENCODING_TEXT_AND_HTML = 0x00100000L; protected static final long BODY_ENCODING_TEXT_AND_HTML = 0x00100000L;
protected static final long MAC_ATTACH_ENCODING_UUENCODE = 0x00200000L; //protected static final long MAC_ATTACH_ENCODING_UUENCODE = 0x00200000L;
protected static final long MAC_ATTACH_ENCODING_APPLESINGLE = 0x00400000L; //protected static final long MAC_ATTACH_ENCODING_APPLESINGLE = 0x00400000L;
protected static final long MAC_ATTACH_ENCODING_APPLEDOUBLE = 0x00600000L; //protected static final long MAC_ATTACH_ENCODING_APPLEDOUBLE = 0x00600000L;
protected static final long OOP_DONT_LOOKUP = 0x10000000L; //protected static final long OOP_DONT_LOOKUP = 0x10000000L;
@Override @Override
public void sendMessage(MimeMessage mimeMessage) throws IOException { public void sendMessage(MimeMessage mimeMessage) throws IOException {
@ -2420,7 +2420,7 @@ public class DavExchangeSession extends ExchangeSession {
@Override @Override
protected byte[] getContent(ExchangeSession.Message message) throws IOException { protected byte[] getContent(ExchangeSession.Message message) throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
InputStream contentInputStream = null; InputStream contentInputStream;
try { try {
try { try {
contentInputStream = getContentInputStream(message.messageUrl); contentInputStream = getContentInputStream(message.messageUrl);