Cleanup smtp code

jenkins-infra · Jun 7, 2017 · 1522f7d · 1522f7d
1 parent 4fafa8a
commit 1522f7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/account/Application.java b/src/main/java/org/jenkinsci/account/Application.java
@@ -490,9 +490,8 @@ public void delete(DirContext con) throws NamingException {
     private Session createJavaMailSession() {
         Session session;
         Properties props = new Properties(System.getProperties());
-        System.out.printf(params.smtpAuth());
         props.put("mail.smtp.host",params.smtpServer());
-        if(params.smtpAuth().equals("true")) {
+        if(params.smtpAuth()) {
             props.put("mail.smtp.auth", params.smtpAuth());
             props.put("mail.smtp.starttls.enable", true);
             props.put("mail.smtp.port", 587);

diff --git a/src/main/java/org/jenkinsci/account/Parameters.java b/src/main/java/org/jenkinsci/account/Parameters.java
@@ -1,5 +1,7 @@
 package org.jenkinsci.account;
 
+import com.sun.org.apache.xpath.internal.operations.Bool;
+
 import java.util.Date;
 
 /**
@@ -26,9 +28,9 @@ public interface Parameters {
      * smtpAuth: If true, attempt to authenticate the user using the AUTH command.
      * smtpPassword: SMTP password for SMTP server.
      */
+    Boolean smtpAuth();
     String smtpServer();
     String smtpUser();
-    String smtpAuth();
     String smtpPassword();
 
     String recaptchaPublicKey();