serge 2003/02/06 07:15:08
Modified: src/java/org/apache/james/transport/mailets Tag:
branch_2_1_fcs RemoteDelivery.java
Log:
Removed setting mail.smtp.user property that caused a memory leak (submitted by
Jason Webb).
Revision Changes Path
No revision
No revision
1.33.4.3 +7 -10
jakarta-james/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
Index: RemoteDelivery.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/RemoteDelivery.java,v
retrieving revision 1.33.4.2
retrieving revision 1.33.4.3
diff -u -r1.33.4.2 -r1.33.4.3
--- RemoteDelivery.java 4 Feb 2003 21:07:56 -0000 1.33.4.2
+++ RemoteDelivery.java 6 Feb 2003 15:15:07 -0000 1.33.4.3
@@ -45,11 +45,11 @@
* You really want to read the JavaMail documentation if you are
* working in here, and you will want to view the list of JavaMail
* attributes, which are documented here:
- *
+ *
*
http://java.sun.com/products/javamail/1.3/docs/javadocs/com/sun/mail/smtp/package-summary.html
*
* as well as other places.
- *
+ *
* @author Serge Knystautas <[EMAIL PROTECTED]>
* @author Federico Barbieri <[EMAIL PROTECTED]>
*
@@ -208,13 +208,10 @@
URLName urlname = new URLName("smtp://" +
outgoingMailServer);
Properties props = session.getProperties();
- //This was an older version of JavaMail
if (mail.getSender() == null) {
- props.put("mail.smtp.user", "<>");
props.put("mail.smtp.from", "<>");
} else {
String sender = mail.getSender().toString();
- props.put("mail.smtp.user", sender);
props.put("mail.smtp.from", sender);
}
@@ -265,7 +262,7 @@
log(exceptionBuffer.toString());
//Assume it is a permanent exception, or prove ourselves
otherwise
boolean permanent = true;
- if ((me.getNextException() != null) &&
+ if ((me.getNextException() != null) &&
(me.getNextException() instanceof java.io.IOException))
{
//This is more than likely a temporary failure
@@ -359,7 +356,7 @@
.append(mail.getName())
.append(" into outgoing after ")
.append(retries)
- .append(" retries");
+ .append(" retries");
log(logBuffer.toString());
++retries;
mail.setErrorMessage(retries + "");
@@ -372,7 +369,7 @@
.append(mail.getName())
.append(" after ")
.append(retries)
- .append(" retries");
+ .append(" retries");
log(logBuffer.toString());
}
}
@@ -577,7 +574,7 @@
String key = outgoing.accept(delayTime);
try {
if (isDebug) {
- StringBuffer logMessageBuffer =
+ StringBuffer logMessageBuffer =
new StringBuffer(128)
.append(Thread.currentThread().getName())
.append(" will process mail ")
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
