Author: veithen
Date: Thu Oct 2 14:45:46 2008
New Revision: 701250
URL: http://svn.apache.org/viewvc?rev=701250&view=rev
Log:
Mail transport: instead of requerying the transport.mail.ReplyAddress parameter
from the service, use the replyAddress property from the PollTableEntry (as we
do with the other parameters).
Modified:
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
webservices/commons/trunk/modules/transport/src/site/xdoc/mail.xml
Modified:
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java?rev=701250&r1=701249&r2=701250&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
Thu Oct 2 14:45:46 2008
@@ -329,9 +329,9 @@
outInfo.setTargetAddresses((InternetAddress[]) message.getFrom());
} else {
// does the service specify a default reply address ?
- Parameter param =
service.getParameter(MailConstants.TRANSPORT_MAIL_REPLY_ADDRESS);
- if (param != null && param.getValue() != null) {
- outInfo.setTargetAddresses(InternetAddress.parse((String)
param.getValue()));
+ InternetAddress replyAddress = entry.getReplyAddress();
+ if (replyAddress != null) {
+ outInfo.setTargetAddresses(new InternetAddress[] {
replyAddress });
}
}
@@ -473,7 +473,6 @@
entry.setContentType(
ParamUtils.getOptionalParam(service,
MailConstants.TRANSPORT_MAIL_CONTENT_TYPE));
- // FIXME: the value of the transport.mail.ReplyAddress parameter
is never used
entry.setReplyAddress(
ParamUtils.getOptionalParam(service,
MailConstants.TRANSPORT_MAIL_REPLY_ADDRESS));
Modified: webservices/commons/trunk/modules/transport/src/site/xdoc/mail.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/src/site/xdoc/mail.xml?rev=701250&r1=701249&r2=701250&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/src/site/xdoc/mail.xml
(original)
+++ webservices/commons/trunk/modules/transport/src/site/xdoc/mail.xml Thu Oct
2 14:45:46 2008
@@ -90,7 +90,8 @@
<tr>
<td>transport.mail.ReplyAddress</td>
<td>No</td>
- <td>[FIXME: this parameter is recognized but actually
never used]</td>
+ <td>The reply-to address to be used when no From or
Reply-To header is present in the
+ request message.</td>
</tr>
<tr>
<td>transport.mail.PreserveHeaders,
transport.mail.RemoveHeaders</td>
