You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/04/03 19:14:34 UTC

svn commit: r930545 - in /james/server/trunk/spoolmanager/src/main/java/org/apache/james: FileSpoolMessageStore.java transport/camel/MailEnricher.java

Author: norman
Date: Sat Apr  3 17:14:34 2010
New Revision: 930545

URL: http://svn.apache.org/viewvc?rev=930545&view=rev
Log:
Make sure that the file is deleted after spooling is done

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

Modified: james/server/trunk/spoolmanager/src/main/java/org/apache/james/FileSpoolMessageStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/FileSpoolMessageStore.java?rev=930545&r1=930544&r2=930545&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/main/java/org/apache/james/FileSpoolMessageStore.java (original)
+++ james/server/trunk/spoolmanager/src/main/java/org/apache/james/FileSpoolMessageStore.java Sat Apr  3 17:14:34 2010
@@ -123,6 +123,10 @@ public class FileSpoolMessageStore imple
             return id;
         }
 
+        /*
+         * (non-Javadoc)
+         * @see org.apache.james.lifecycle.Disposable#dispose()
+         */
         public void dispose() {
             file.delete();
         }

Modified: james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/MailEnricher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/MailEnricher.java?rev=930545&r1=930544&r2=930545&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/MailEnricher.java (original)
+++ james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/MailEnricher.java Sat Apr  3 17:14:34 2010
@@ -26,7 +26,6 @@ import javax.mail.MessagingException;
 import org.apache.camel.Body;
 import org.apache.camel.Exchange;
 import org.apache.james.SpoolMessageStore;
-import org.apache.james.core.MimeMessageCopyOnWriteProxy;
 import org.apache.james.core.MimeMessageWrapper;
 import org.apache.mailet.Mail;
 
@@ -61,7 +60,7 @@ public final class MailEnricher {
         
         // put back the MimeMessage
         try {
-            mail.setMessage(new MimeMessageCopyOnWriteProxy(new MimeMessageWrapper(spoolMessageStore.getMessage(key))));
+            mail.setMessage(new MimeMessageWrapper(spoolMessageStore.getMessage(key)));
         } catch (IOException e) {
             throw new MessagingException("Unable to enrich mail " + mail, e);
         }



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