svn commit: r931622 - /james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/MailClaimCheck.java

[no...@apache.org]

Author: norman
Date: Wed Apr  7 17:21:59 2010
New Revision: 931622

URL: http://svn.apache.org/viewvc?rev=931622&view=rev
Log:
Check if the mail contains a MimeMessage before trying to call writeTo on it. (Prevent NPE)

Modified:
    james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/MailClaimCheck.java

Modified: james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/MailClaimCheck.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/MailClaimCheck.java?rev=931622&r1=931621&r2=931622&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/MailClaimCheck.java (original)
+++ james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/MailClaimCheck.java Wed Apr  7 17:21:59 2010
@@ -23,6 +23,7 @@ package org.apache.james.transport.camel
 import java.io.OutputStream;
 
 import javax.annotation.Resource;
+import javax.mail.internet.MimeMessage;
 
 import org.apache.camel.Body;
 import org.apache.camel.Exchange;
@@ -55,12 +56,18 @@ public final class MailClaimCheck {
      */
     public void saveMessage(Exchange exchange, @Body Mail mail) throws Exception{
         
-        OutputStream out = spoolMessageStore.saveMessage(mail.getName());
-        // write the message to the store
-        mail.getMessage().writeTo(out);
+        MimeMessage m = mail.getMessage();
+
+        // Check if the message is not null first.. This could be the case if the message was set to
+        // null before or was disposed
+        if (m != null) {
+            OutputStream out = spoolMessageStore.saveMessage(mail.getName());
+            // write the message to the store
+            m.writeTo(out);
         
-        // close stream
-        out.close();
+            // close stream
+            out.close();
+        }
         
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org