svn commit: r1362601 - in /james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver: DataLineJamesMessageHookHandler.java model/MailetMailAddressAdapter.java

[eric]

Author: eric
Date: Tue Jul 17 18:43:17 2012
New Revision: 1362601

URL: http://svn.apache.org/viewvc?rev=1362601&view=rev
Log:
Use a null MailetMailAddressAdapter if sender is NULL_MAILSENDER (JAMES-1422)

Modified:
    
james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
    
james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/MailetMailAddressAdapter.java

Modified: 
james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java?rev=1362601&r1=1362600&r2=1362601&view=diff
==============================================================================
--- 
james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
 (original)
+++ 
james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
 Tue Jul 17 18:43:17 2012
@@ -96,10 +96,15 @@ public class DataLineJamesMessageHookHan
                 for (MailAddress address: recipientCollection) {
                     rcpts.add(new MailetMailAddressAdapter(address));
                 }
-                MailImpl mail = new MailImpl(MailImpl.getId(), new 
MailetMailAddressAdapter(mailAddress), rcpts);
+                
+                MailetMailAddressAdapter mailetMailAddressAdapter = null;
+                if (mailAddress != MailAddress.nullSender()) {
+                    mailetMailAddressAdapter = new 
MailetMailAddressAdapter(mailAddress);
+                }
+
+                MailImpl mail = new MailImpl(MailImpl.getId(), 
mailetMailAddressAdapter, rcpts);
 
-                // store mail in the session so we can be sure it get disposed
-                // later
+                // store mail in the session so we can be sure it get disposed 
later
                 session.setAttachment(SMTPConstants.MAIL, mail, 
State.Transaction);
 
                 MimeMessageCopyOnWriteProxy mimeMessageCopyOnWriteProxy = null;

Modified: 
james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/MailetMailAddressAdapter.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/MailetMailAddressAdapter.java?rev=1362601&r1=1362600&r2=1362601&view=diff
==============================================================================
--- 
james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/MailetMailAddressAdapter.java
 (original)
+++ 
james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/MailetMailAddressAdapter.java
 Tue Jul 17 18:43:17 2012
@@ -27,7 +27,7 @@ public class MailetMailAddressAdapter ex
     private static final long serialVersionUID = 1L;
 
     public 
MailetMailAddressAdapter(org.apache.james.protocols.smtp.MailAddress 
mailAddress) throws AddressException {
-        super(mailAddress.toString());
+        super(mailAddress.getLocalPart(), mailAddress.getDomain());
     }
 
 }



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