[JENKINS-23256]

Don't let a problem in MailAddressResolver affect the innocent caller
jenkinsci · May 31, 2014 · c5497e0 · c5497e0 · oleg-nenashev · Jun 1, 2014
1 parent 2019ce6
commit c5497e0
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/main/java/hudson/tasks/MailAddressResolver.java b/src/main/java/hudson/tasks/MailAddressResolver.java
@@ -118,12 +118,16 @@ public static String resolve(User u) {
         }
 
         for (MailAddressResolver r : all()) {
-            String email = r.findMailAddressFor(u);
-            if(email!=null) {
-                if (LOGGER.isLoggable(Level.FINE)) {
-                    LOGGER.fine(r+" resolved "+u.getId()+" to "+email);
+            try {
+                String email = r.findMailAddressFor(u);
+                if(email!=null) {
+                    if (LOGGER.isLoggable(Level.FINE)) {
+                        LOGGER.fine(r+" resolved "+u.getId()+" to "+email);
+                    }
+                    return email;
                 }
-                return email;
+            } catch (Exception e) {
+                LOGGER.log(Level.WARNING, r+" failed to resolve "+u+". Ignoring and moving on",e);
             }
         }