Author: eric
Date: Wed Jan 19 10:52:34 2011
New Revision: 1060760

URL: http://svn.apache.org/viewvc?rev=1060760&view=rev
Log:
Fix the mail inputstream import (MAILBOX-34)

Modified:
    
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java

Modified: 
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java?rev=1060760&r1=1060759&r2=1060760&view=diff
==============================================================================
--- 
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
 (original)
+++ 
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
 Wed Jan 19 10:52:34 2011
@@ -27,6 +27,7 @@ import javax.mail.Flags;
 import javax.mail.MessagingException;
 
 import org.apache.commons.logging.Log;
+import org.apache.james.core.MimeMessageInputStream;
 import org.apache.james.domainlist.api.DomainList;
 import org.apache.james.domainlist.api.DomainListException;
 import org.apache.james.lifecycle.api.LogEnabled;
@@ -152,7 +153,7 @@ public class James23Importer implements 
                 mailboxManager.createMailbox(mailboxPath, mailboxSession);
             }
             catch (MailboxExistsException e) {
-                // Do nothing.
+                // Do nothing, the mailbox already exists.
             }
             mailboxManager.endProcessingRequest(mailboxSession);
 
@@ -161,9 +162,8 @@ public class James23Importer implements 
             while (mailRepositoryIterator.hasNext()) {
                 Mail mail = 
mailRepository.retrieve(mailRepositoryIterator.next());
                 mailboxManager.startProcessingRequest(mailboxSession);
-                // TODO We need to build the full message, not only the body.
-                
messageManager.appendMessage(mail.getMessage().getInputStream(), 
-                        mail.getMessage().getReceivedDate(), 
+                messageManager.appendMessage(new 
MimeMessageInputStream(mail.getMessage()), 
+                        new Date(), 
                         mailboxSession, 
                         isRecent, 
                         flags);



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to