[Yanel-commits] rev 49051 - public/yanel/trunk/src/core/java/org/wyona/yanel/core

[guillaume at wyona.com]

Author: guillaume
Date: 2010-04-27 10:11:32 +0200 (Tue, 27 Apr 2010)
New Revision: 49051

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/Yanel.java
Log:
Minor refactoring: reduced scope of try-catch block.


Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/Yanel.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/Yanel.java	2010-04-27 08:05:42 UTC (rev 49050)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/Yanel.java	2010-04-27 08:11:32 UTC (rev 49051)
@@ -100,19 +100,22 @@
        }
 
        if (config.getChild("smtp", false) != null) {
+
            String smtpPortSt = config.getChild("smtp").getAttribute("port");
            try {
                smtpPort = Integer.parseInt(smtpPortSt);
-               smtpHost = config.getChild("smtp").getAttribute("host");
-               java.util.Properties props = new java.util.Properties();
-               props.put("mail.smtp.host", smtpHost);
-               props.put("mail.smtp.port", smtpPortSt);
-               // http://java.sun.com/products/javamail/javadocs/javax/mail/Session.html
-               javax.mail.Session session = javax.mail.Session.getDefaultInstance(props, null);
-               log.info("Mailserver default session (available to all code executing in the same JVM): " + session.getProperty("mail.smtp.host") + ":" + session.getProperty("mail.smtp.port"));
            } catch(NumberFormatException e) {
                log.warn("Mail server not configured, because SMTP port '" + smtpPortSt + "' does not seem to be a number! Check within configuration: " + configFile);
            }
+
+           smtpHost = config.getChild("smtp").getAttribute("host");
+
+           java.util.Properties props = new java.util.Properties();
+           props.put("mail.smtp.host", smtpHost);
+           props.put("mail.smtp.port", smtpPortSt);
+           // http://java.sun.com/products/javamail/javadocs/javax/mail/Session.html
+           javax.mail.Session session = javax.mail.Session.getDefaultInstance(props, null);
+           log.info("Mailserver default session (available to all code executing in the same JVM): " + session.getProperty("mail.smtp.host") + ":" + session.getProperty("mail.smtp.port"));
        } else {
            log.warn("Mail server not configured within configuration: " + configFile);
        }