From 7b9bfcdbcf31da075cc0e8195a294964e8023fe1 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 17 Mar 2007 09:02:22 +0000 Subject: [PATCH] minor refactoring in SMTP darcs-hash:20070317090222-5007d-5e128e2f7f7f95af69bcfa68bc7869ecbdfc2805.gz --- src/org/ibex/mail/SMTP.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/org/ibex/mail/SMTP.java b/src/org/ibex/mail/SMTP.java index eed1a31..a23c7de 100644 --- a/src/org/ibex/mail/SMTP.java +++ b/src/org/ibex/mail/SMTP.java @@ -344,15 +344,11 @@ public class SMTP { conn.println("HELO " + conn.vhost); check(conn.readln(), conn); } - if (m.envelopeFrom==null) { - Log.warn("", "MAIL FROM:<>"); - conn.println("MAIL FROM:<>"); check(conn.readln(), conn); - } else { - Log.warn("", "MAIL FROM:<" + m.envelopeFrom.toString()+">"); - conn.println("MAIL FROM:<" + m.envelopeFrom.toString()+">"); check(conn.readln(), conn); - } - conn.println("RCPT TO:<" + m.envelopeTo.toString()+">"); check(conn.readln(), conn); - conn.println("DATA"); check(conn.readln(), conn); + String envelopeFrom = m.envelopeFrom==null ? "" : m.envelopeFrom.toString(); + conn.println("MAIL FROM:<" + envelopeFrom +">"); check(conn.readln(), conn); + conn.println("RCPT TO:<" + m.envelopeTo.toString()+">"); check(conn.readln(), conn); + conn.println("DATA"); check(conn.readln(), conn); + Headers head = m.headers; head = head.remove("return-path"); head = head.remove("bcc"); -- 1.7.10.4