[JENKINS-19433] - Fixed comments from @jglick

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
jenkinsci · Feb 23, 2014 · fe2d408 · fe2d408
1 parent 0a8d52a
commit fe2d408
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/hudson/tasks/MailAddressResolver.java b/src/main/java/hudson/tasks/MailAddressResolver.java
@@ -133,7 +133,7 @@ public static String resolveFast(User u) {
 
         // Try user properties
         Mailer.UserProperty emailProperty = u.getProperty(Mailer.UserProperty.class);
-        if (emailProperty != null && emailProperty.hasExplicitlyConfiguredAddress()) {
+        if (emailProperty != null) {
             String explicitAddress = emailProperty.getExplicitlyConfiguredAddress();
             if (explicitAddress != null) // A final check to prevent concurrency issues
                 return explicitAddress;

diff --git a/src/main/java/hudson/tasks/Mailer.java b/src/main/java/hudson/tasks/Mailer.java
@@ -57,6 +57,7 @@
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
+import javax.annotation.CheckForNull;
 import javax.mail.Address;
 import javax.mail.Authenticator;
 import javax.mail.Message;
@@ -565,6 +566,7 @@ public String getConfiguredAddress() {
          * @return A trimmed email address. It can be null
          * @since TODO
          */
+        @CheckForNull
         public String getExplicitlyConfiguredAddress() {
             return Util.fixEmptyAndTrim(emailAddress);
         }