[cvs] expresso commit by lhamel: provide default SMTP port number for sake of

[JCorporate Ltd]

Log Message:
-----------
provide default SMTP port number for sake of legacy

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc:
        EMailSender.java

Revision Data
-------------
Index: EMailSender.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java -u -r1.26 -r1.27
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java
@@ -69,14 +69,11 @@
  */
 package com.jcorporate.expresso.core.misc;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Vector;
+import com.jcorporate.expresso.core.db.DBConnection;
+import com.jcorporate.expresso.core.db.DBException;
+import com.jcorporate.expresso.core.registry.RequestRegistry;
+import com.jcorporate.expresso.services.dbobj.Setup;
+import org.apache.log4j.Logger;
 
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
@@ -88,13 +85,14 @@
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
-
-import org.apache.log4j.Logger;
-
-import com.jcorporate.expresso.core.db.DBConnection;
-import com.jcorporate.expresso.core.db.DBException;
-import com.jcorporate.expresso.core.registry.RequestRegistry;
-import com.jcorporate.expresso.services.dbobj.Setup;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Vector;
 
 /**
  * EMailSender is a class that hides the details of sending email through an SMTP server
@@ -390,27 +388,19 @@
      * the value is retrieved from the setting of the MAILPort Setup parameter.
      *
      * @return the SMTP server port
-     * @throws Exception If MAILPort parameter is not provided in Setup
      */
     private String getSMTPPort()
             throws Exception {
-        String thisMethod = thisClass + "getSMTPPort()";
         String myPort = StringUtil.notNull(port);
 
-        try {
-            if (myPort.equals(StringUtil.EMPTY_STRING)) {
-                myPort = Setup.getValueRequired(getDataContext(), "MAILPort");
+        if (myPort.length() == 0) {
+            myPort = Setup.getValueUnrequired(getDataContext(), "MAILPort");
+            if ( StringUtil.isBlankOrNull(myPort) ) {
+                myPort = "25"; // default
             }
-        } catch (DBException dex) {
-            log.error("DB exception getting MAILPort:" + messageDetails(),
-                    dex);
-            throw new Exception(thisMethod +
-                    ":DB exception getting MAILPort:" +
-                    dex.getMessage());
         }
 
         port = myPort;
-
         return myPort;
     } /* getSMTPPort() */