GERONIMO-2806 mail.null.host property not resolved by SMTPTransport class
git-svn-id: https://svn.apache.org/repos/asf/geronimo/javamail/trunk@509954 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java b/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
index 6ea1769..a93e83e 100644
--- a/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
+++ b/geronimo-javamail_1.3.1_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
@@ -361,6 +361,12 @@
if (mustAuthenticate && (username == null || password == null)) {
return false;
}
+
+
+ // Before we do anything, let's make sure that we succesfully received a host
+ if ( host == null ) {
+ host = DEFAULT_MAIL_HOST;
+ }
// if the port is defaulted, then see if we have something configured in
// the session.
diff --git a/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java b/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
index 6ea1769..e07f5f2 100644
--- a/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
+++ b/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
@@ -347,7 +347,7 @@
debugOut("Connecting to server " + host + ":" + port + " for user " + username);
}
- // first check to see if we need to authenticate. If we need this, then
+ // now check to see if we need to authenticate. If we need this, then
// we must have a username and
// password specified. Failing this may result in a user prompt to
// collect the information.
@@ -373,6 +373,11 @@
port = Integer.parseInt(configuredPort);
}
}
+
+ // Before we do anything, let's make sure that we succesfully received a host
+ if ( host == null ) {
+ host = DEFAULT_MAIL_HOST;
+ }
try {
