noel 2003/02/08 21:16:15
Modified: src/java/org/apache/james/transport/mailets Tag:
branch_2_1_fcs ServerTime.java
Log:
Use addresses from MAIL FROM/RCPT TO if headers are missing. Start to use
saveChanges(), since we'll eventually remove the internal 'convenience' calls.
Revision Changes Path
No revision
No revision
1.5.4.1 +13 -6
jakarta-james/src/java/org/apache/james/transport/mailets/ServerTime.java
Index: ServerTime.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/ServerTime.java,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- ServerTime.java 2 Oct 2002 07:27:44 -0000 1.5
+++ ServerTime.java 9 Feb 2003 05:16:15 -0000 1.5.4.1
@@ -42,14 +42,21 @@
.append(".");
response.setText(textBuffer.toString());
- Set recipients = new HashSet();
- Address addresses[] = response.getAllRecipients();
- for (int i = 0; i < addresses.length; i++) {
- recipients.add(new MailAddress((InternetAddress)addresses[0]));
+ // Someone manually checking the server time by hand may send
+ // an formatted message, lacking From and To headers. If the
+ // response fields are null, try setting them from the SMTP
+ // MAIL FROM/RCPT TO commands used to send the inquiry.
+
+ if (response.getFrom() == null) {
+
response.setFrom(((MailAddress)mail.getRecipients().iterator().next()).toInternetAddress());
+ }
+
+ if (response.getAllRecipients() == null) {
+ response.setRecipients(MimeMessage.RecipientType.TO,
mail.getSender().toString());
}
- MailAddress sender = new
MailAddress((InternetAddress)response.getFrom()[0]);
- getMailetContext().sendMail(sender, recipients, response);
+ response.saveChanges();
+ getMailetContext().sendMail(response);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
