Fix JENKINS-16919

Fixed NPE by checking return of the getters for the SendFailedException.
jenkinsci · Feb 22, 2013 · 9f207ef · 9f207ef
1 parent 7ae2734
commit 9f207ef
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java b/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java
@@ -317,29 +317,31 @@ private boolean sendMail(EmailType mailType, AbstractBuild<?, ?> build, BuildLis
                                 Thread.sleep(10000);
                             } else {
                                 Address[] addresses = e.getValidSentAddresses();
-                                if(addresses.length > 0) {
+                                if(addresses != null && addresses.length > 0) {
                                     buf = new StringBuilder("Successfully sent to the following addresses:");
                                     for (Address a : addresses) {
                                         buf.append(' ').append(a);
                                     }
                                     listener.getLogger().println(buf);
                                 }
                                 addresses = e.getValidUnsentAddresses();
-                                if(addresses.length > 0) {
+                                if(addresses != null && addresses.length > 0) {
                                     buf = new StringBuilder("Error sending to the following VALID addresses:");
                                     for (Address a : addresses) {
                                         buf.append(' ').append(a);
                                     }
                                     listener.getLogger().println(buf);
                                 }
                                 addresses = e.getInvalidAddresses();
-                                if(addresses.length > 0) {
+                                if(addresses != null && addresses.length > 0) {
                                     buf = new StringBuilder("Error sending to the following INVALID addresses:");
                                     for (Address a : addresses) {
                                         buf.append(' ').append(a);
                                     }
                                     listener.getLogger().println(buf);
                                 }
+
+                                debug(listener.getLogger(), "SendFailedException message: " + e.getMessage());
                                 break;
                             }
                         }