Fix JENKINS-28357

If template doesn't exist, try with extension added.
jenkinsci · May 15, 2015 · f72f226 · f72f226
1 parent 970c7e1
commit f72f226
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/emailext/plugins/content/AbstractEvalContent.java b/src/main/java/hudson/plugins/emailext/plugins/content/AbstractEvalContent.java
@@ -104,7 +104,13 @@ protected InputStream getFileInputStream(String fileName, String extension)
                 "hudson/plugins/emailext/templates/" + fileName);
 
         if (inputStream == null) {
-            final File templateFile = new File(scriptsFolder(), fileName);
+            File templateFile = new File(scriptsFolder(), fileName);
+
+            // the file may have an extension, but not the correct one
+            if(!templateFile.exists()) {
+                fileName += extension;
+                templateFile = new File(scriptsFolder(), fileName);
+            }            
             inputStream = new FileInputStream(templateFile);
         }