danny 01/12/18 02:00:09
Modified: src/java/org/apache/james/transport/mailets Redirect.java
Log:
Patched as submitted by Iwasa Kazmi [[EMAIL PROTECTED]] to handle null
postmaster and sender
Revision Changes Path
1.2 +41 -36
jakarta-james/src/java/org/apache/james/transport/mailets/Redirect.java
Index: Redirect.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/Redirect.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Redirect.java 2001/10/23 10:22:40 1.1
+++ Redirect.java 2001/12/18 10:00:09 1.2
@@ -388,24 +388,27 @@
/**
* returns the senders address, as a MailAddress
*/
- public MailAddress getSender(){
- String sr = getInitParameter("sender");
- MailAddress rv;
- if(sr.compareTo("postmaster")==0){
- rv = getMailetContext().getPostmaster();
- return rv;
- }
- if((sr.compareTo("sender")==0) || (sr==null)){
- return null;
- }
- try{
- rv = new MailAddress(sr);
- return rv;
- }catch(Exception e){
- log("Parse error in getSender "+sr);
- }
- return null;
- }
+ public MailAddress getSender(){
+ String sr = getInitParameter("sender");
+ if(sr != null){
+ MailAddress rv;
+ if(sr.compareTo("postmaster")==0){
+ rv = getMailetContext().getPostmaster();
+ return rv;
+ }
+ if(sr.compareTo("sender")==0){
+ return null;
+ }
+ try{
+ rv = new MailAddress(sr);
+ return rv;
+ }catch(Exception e){
+ log("Parse error in getSender "+sr);
+ }
+ }
+ return null;
+ }
+
/**
* returns one of these values to indicate how to append the original message
*<ul>
@@ -465,25 +468,27 @@
/**
* return the reply to address as a string
*/
- public MailAddress getReplyTo(){
- String sr = getInitParameter("replyto");
+public MailAddress getReplyTo(){
+ String sr = getInitParameter("replyto");
+ if(sr != null){
+ MailAddress rv;
+ if(sr.compareTo("postmaster")==0){
+ rv = getMailetContext().getPostmaster();
+ return rv;
+ }
+ if(sr.compareTo("sender")==0){
+ return null;
+ }
+ try{
+ rv = new MailAddress(sr);
+ return rv;
+ }catch(Exception e){
+ log("Parse error in getReplyTo "+sr);
+ }
+ }
+ return null;
+ }
- MailAddress rv;
- if(sr.compareTo("postmaster")==0){
- rv = getMailetContext().getPostmaster();
- return rv;
- }
- if((sr.compareTo("sender")==0) || (sr == null)){
- return null;
- }
- try{
- rv = new MailAddress(sr);
- return rv;
- }catch(Exception e){
- log("Parse error in getReplyTo "+sr);
- }
- return null;
- }
/**
* return a prefix for the message subject
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
