Fix JENKINS-22610

Added check if the returned value from getTemplateById is null. Write error to the build log if the template is missing.
jenkinsci · Apr 14, 2014 · 7c9af27 · 7c9af27
1 parent 3f2aece
commit 7c9af27
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/emailext_template/ExtendedEmailTemplatePublisher.java b/src/main/java/org/jenkinsci/plugins/emailext_template/ExtendedEmailTemplatePublisher.java
@@ -48,7 +48,11 @@ public boolean prebuild(AbstractBuild<?, ?> build, BuildListener listener) {
         boolean result = true;
         for(TemplateId template : templateIds) {
             ExtendedEmailPublisherTemplate t = getDescriptor().getTemplateById(template.getTemplateId());
-            result &= t.getPublisher().prebuild(build, listener);
+            if(t != null) {
+                result &= t.getPublisher().prebuild(build, listener);
+            } else {
+                listener.getLogger().println("Template with ID " + template.getTemplateId() + " has been removed, please double check your settings");
+            }
         }
 
         return result;        
@@ -61,6 +65,8 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
             ExtendedEmailPublisherTemplate t = getDescriptor().getTemplateById(template.getTemplateId());
             if(t != null) {
                 result &= t.getPublisher().perform(build, launcher, listener);
+            } else {
+                listener.getLogger().println("Template with ID " + template.getTemplateId() + " has been removed, please double check your settings");
             }
         }
         return result;