[Yanel-commits] rev 47372 -
public/yanel/trunk/src/core/java/org/wyona/yanel/core
michi at wyona.com
michi at wyona.com
Sat Jan 30 23:25:22 CET 2010
Author: michi
Date: 2010-01-30 23:25:21 +0100 (Sat, 30 Jan 2010)
New Revision: 47372
Modified:
public/yanel/trunk/src/core/java/org/wyona/yanel/core/Yanel.java
Log:
check if smtp port is a number and make it available via Yanel
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-01-30 19:05:18 UTC (rev 47371)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/Yanel.java 2010-01-30 22:25:21 UTC (rev 47372)
@@ -50,6 +50,9 @@
private static Yanel yanel = null;
+ private String smtpHost = null;
+ private int smtpPort = -1;
+
private String version = null;
private String revision = null;
private String reservedPrefix = null;
@@ -110,14 +113,19 @@
}
if (config.getChild("smtp", false) != null) {
- String smtpHost = config.getChild("smtp").getAttribute("host");
- String smtpPort = config.getChild("smtp").getAttribute("port");
- java.util.Properties props = new java.util.Properties();
- props.put("mail.smtp.host", smtpHost);
- props.put("mail.smtp.port", smtpPort);
- // 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"));
+ smtpHost = config.getChild("smtp").getAttribute("host");
+ String smtpPortSt = config.getChild("smtp").getAttribute("port");
+ try {
+ smtpPort = Integer.parseInt(smtpPortSt);
+ 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);
+ }
} else {
log.warn("Mail server not configured within configuration: " + configFile);
}
@@ -244,6 +252,20 @@
}
/**
+ * Get SMTP host
+ */
+ public String getSMTPHost() {
+ return smtpHost;
+ }
+
+ /**
+ * Get SMTP port
+ */
+ public int getSMTPPort() {
+ return smtpPort;
+ }
+
+ /**
* Get Yanel reserved prefix
*/
public String getReservedPrefix() {
More information about the Yanel-commits
mailing list