Author: norman
Date: Mon Nov 1 06:40:02 2010
New Revision: 1029563
URL: http://svn.apache.org/viewvc?rev=1029563&view=rev
Log:
MimeMessageInputStream constructor should throw MessagingException and not
IOException
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStream.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStream.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStream.java?rev=1029563&r1=1029562&r2=1029563&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStream.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStream.java
Mon Nov 1 06:40:02 2010
@@ -35,21 +35,19 @@ public class MimeMessageInputStream exte
private InputStream in;
@SuppressWarnings("unchecked")
- public MimeMessageInputStream(MimeMessage message) throws IOException {
+ public MimeMessageInputStream(MimeMessage message) throws
MessagingException {
MimeMessage m = message;
+
+ // check if we need to use the wrapped message
if (m instanceof MimeMessageCopyOnWriteProxy) {
m = ((MimeMessageCopyOnWriteProxy) message).getWrappedMessage();
}
- try {
- if (m instanceof MimeMessageWrapper) {
- in = ((MimeMessageWrapper) m).getMessageInputStream();
- } else {
- in = new CombinedInputStream(new InputStream[] { new
InternetHeadersInputStream(message.getAllHeaderLines()),
message.getRawInputStream() });
-
- }
- } catch (MessagingException e) {
- throw new IOException("Unable to read MimeMessage: " +
e.getMessage());
+ // check if we can use optimized operations
+ if (m instanceof MimeMessageWrapper) {
+ in = ((MimeMessageWrapper) m).getMessageInputStream();
+ } else {
+ in = new CombinedInputStream(new InputStream[] { new
InternetHeadersInputStream(message.getAllHeaderLines()),
message.getRawInputStream() });
}
}
@@ -57,7 +55,6 @@ public class MimeMessageInputStream exte
@Override
public int read() throws IOException {
return in.read();
-
}
@Override
Modified:
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java?rev=1029563&r1=1029562&r2=1029563&view=diff
==============================================================================
---
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java
(original)
+++
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java
Mon Nov 1 06:40:02 2010
@@ -173,11 +173,6 @@ public class DataLineLMTPMessageHookHand
mailboxManager.getMailbox(MailboxPath.inbox(username),
mailboxSession).appendMessage(new MimeMessageInputStream(mail.getMessage()),
new Date(), mailboxSession, true, null);
mailboxManager.endProcessingRequest(mailboxSession);
response = new SMTPResponse(SMTPRetCode.MAIL_OK,
DSNStatus.getStatus(DSNStatus.SUCCESS,DSNStatus.CONTENT_OTHER)+" Message
received");
- } catch (IOException e) {
- session.getLogger().info("Unexpected error handling DATA
stream",e);
-
- response = new
SMTPResponse(SMTPRetCode.LOCAL_ERROR,DSNStatus.getStatus(DSNStatus.TRANSIENT,
- DSNStatus.UNDEFINED_STATUS) + " Temporary error
deliver message to " + recipient);
} catch (MessagingException e) {
session.getLogger().info("Unexpected error handling DATA
stream",e);
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java?rev=1029563&r1=1029562&r2=1029563&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
Mon Nov 1 06:40:02 2010
@@ -19,7 +19,6 @@
package org.apache.james.transport.mailets;
-import java.io.IOException;
import java.util.Date;
import javax.annotation.Resource;
@@ -154,8 +153,6 @@ public class SieveMailet extends SieveMa
}
mailbox.appendMessage(new
MimeMessageInputStream(mail), new Date(), session, true, null);
- } catch (IOException e) {
- throw new MessagingException("Failed to write mail
message", e);
} finally {
session.close();
mailboxManager.logout(session, true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
