keycloak-uncached

KEYCLOAK-225 NPe after login when 'Verify email' is enabled

12/10/2013 1:30:12 PM

Details

diff --git a/services/src/main/java/org/keycloak/services/email/EmailSender.java b/services/src/main/java/org/keycloak/services/email/EmailSender.java
index 5080fdd..8947ef4 100755
--- a/services/src/main/java/org/keycloak/services/email/EmailSender.java
+++ b/services/src/main/java/org/keycloak/services/email/EmailSender.java
@@ -55,33 +55,33 @@ public class EmailSender {
     }
 
     public void send(String address, String subject, String body) throws EmailException {
-        Properties props = new Properties();
-        props.setProperty("mail.smtp.host", config.get("host"));
+        try {
+            Properties props = new Properties();
+            props.setProperty("mail.smtp.host", config.get("host"));
 
-        boolean auth = "true".equals(config.get("auth"));
-        boolean ssl = "true".equals(config.get("ssl"));
-        boolean starttls = "true".equals(config.get("starttls"));
+            boolean auth = "true".equals(config.get("auth"));
+            boolean ssl = "true".equals(config.get("ssl"));
+            boolean starttls = "true".equals(config.get("starttls"));
 
-        if (config.containsKey("port")) {
-            props.setProperty("mail.smtp.port", config.get("port"));
-        }
+            if (config.containsKey("port")) {
+                props.setProperty("mail.smtp.port", config.get("port"));
+            }
 
-        if (auth) {
-            props.put("mail.smtp.auth", "true");
-        }
+            if (auth) {
+                props.put("mail.smtp.auth", "true");
+            }
 
-        if (ssl) {
-            props.put("mail.smtp.socketFactory.port", config.get("port"));
-            props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
-        }
+            if (ssl) {
+                props.put("mail.smtp.socketFactory.port", config.get("port"));
+                props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+            }
 
-        if (starttls) {
-            props.put("mail.smtp.starttls.enable", "true");
-        }
+            if (starttls) {
+                props.put("mail.smtp.starttls.enable", "true");
+            }
 
-        String from = config.get("from");
+            String from = config.get("from");
 
-        try {
             Session session = Session.getInstance(props);
 
             Message msg = new MimeMessage(session);