Author: norman
Date: Tue Nov 21 10:37:47 2006
New Revision: 477805
URL: http://svn.apache.org/viewvc?view=rev&rev=477805
Log:
Revert change to RemoteDelivery which i commit before.. that was not wanted
Modified:
james/server/trunk/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
Modified:
james/server/trunk/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/mailets/RemoteDelivery.java?view=diff&rev=477805&r1=477804&r2=477805
==============================================================================
---
james/server/trunk/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
(original)
+++
james/server/trunk/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
Tue Nov 21 10:37:47 2006
@@ -377,7 +377,7 @@
}
}
-
+
/*
* private method to log the extended SendFailedException introduced in
JavaMail 1.3.2.
*/
@@ -797,31 +797,13 @@
} else {
out.print("Temporary");
}
- StringBuffer logBuffer = new StringBuffer(64)
+ StringBuffer logBuffer =
+ new StringBuffer(64)
.append(" exception delivering mail (")
.append(mail.getName())
- .append(". ");
+ .append(": ");
out.print(logBuffer.toString());
-
- // Try to log the remote mailserver answer to give some informations
why the message was not accepted
- if (ex instanceof SMTPSendFailedException) {
- out.println("Remote Host said: " + ex.getMessage() + ".");
- } else {
- Exception e;
- while ((e = ex.getNextException()) != null && e instanceof
MessagingException) {
- if (e instanceof SMTPAddressFailedException) {
- SMTPAddressFailedException exception =
(SMTPAddressFailedException) e;
- Address[] addresses = exception.getInvalidAddresses();
-
- for(int i = 0; i < addresses.length; i++) {
- out.println(addresses[i] + " -> " + e.getMessage());
- }
- }
- }
- }
-
if (isDebug) ex.printStackTrace(out);
-
log(sout.toString());
if (!permanent) {
if (!mail.getState().equals(Mail.ERROR)) {
@@ -886,8 +868,6 @@
}
return true;
}
-
-
private void bounce(Mail mail, MessagingException ex) {
StringWriter sout = new StringWriter();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
