svn commit: r393430 - in /james/server/trunk/src/test/org/apache/james: smtpserver/SMTPServerTest.java test/mock/james/MockMailServer.java

[bago]

Author: bago
Date: Wed Apr 12 03:32:33 2006
New Revision: 393430

URL: http://svn.apache.org/viewcvs?rev=393430&view=rev
Log:
Removed NPE in SMTPServerTest (see JAMES-474)

Modified:
    james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
    
james/server/trunk/src/test/org/apache/james/test/mock/james/MockMailServer.java

Modified: 
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
URL: 
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java?rev=393430&r1=393429&r2=393430&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java 
(original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java 
Wed Apr 12 03:32:33 2006
@@ -183,8 +183,9 @@
         assertNull("no mail received by mail server", 
m_mailServer.getLastMail());
 
         smtpProtocol.helo(InetAddress.getLocalHost());
-
+        
         smtpProtocol.mail(new Address("[EMAIL PROTECTED]"));
+        
         smtpProtocol.rcpt(new Address("[EMAIL PROTECTED]"));
 
         smtpProtocol.data(mSource);
@@ -193,6 +194,10 @@
 
         // mail was propagated by SMTPServer
         assertNotNull("mail received by mail server", 
m_mailServer.getLastMail());
+
+        // added to check a NPE in the test (JAMES-474) due to MockMailServer
+        // not cloning the message (added a MimeMessageCopyOnWriteProxy there)
+        System.gc();
 
         int size = ((MimeMessage) m_mailServer.getLastMail()[2]).getSize();
 

Modified: 
james/server/trunk/src/test/org/apache/james/test/mock/james/MockMailServer.java
URL: 
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/test/mock/james/MockMailServer.java?rev=393430&r1=393429&r2=393430&view=diff
==============================================================================
--- 
james/server/trunk/src/test/org/apache/james/test/mock/james/MockMailServer.java
 (original)
+++ 
james/server/trunk/src/test/org/apache/james/test/mock/james/MockMailServer.java
 Wed Apr 12 03:32:33 2006
@@ -16,6 +16,7 @@
  ***********************************************************************/
 package org.apache.james.test.mock.james;
 
+import org.apache.james.core.MimeMessageCopyOnWriteProxy;
 import org.apache.james.services.MailRepository;
 import org.apache.james.services.MailServer;
 import org.apache.james.smtpserver.MessageSizeException;
@@ -46,7 +47,7 @@
     }
 
     public void sendMail(MailAddress sender, Collection recipients, 
MimeMessage msg) throws MessagingException {
-        Object[] mailObjects = new Object[]{sender, recipients, msg};
+        Object[] mailObjects = new Object[]{sender, recipients, new 
MimeMessageCopyOnWriteProxy(msg)};
         mails.add(mailObjects);
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]