Fix JENKINS-28202

Fixed check for file extension
jenkinsci · May 4, 2015 · d5af533 · d5af533
1 parent 66a6c62
commit d5af533
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/emailext/plugins/content/AbstractEvalContent.java b/src/main/java/hudson/plugins/emailext/plugins/content/AbstractEvalContent.java
@@ -36,6 +36,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import jenkins.model.Jenkins;
+import org.apache.commons.io.FilenameUtils;
 import org.jenkinsci.lib.configprovider.ConfigProvider;
 import org.jenkinsci.lib.configprovider.model.Config;
 import org.jenkinsci.plugins.tokenmacro.DataBoundTokenMacro;
@@ -92,10 +93,12 @@ protected InputStream getFileInputStream(String fileName, String extension)
             return inputStream;
         }
 
+        String fileExt = FilenameUtils.getExtension(fileName);
+
         // add .jelly if needed
-        if (!fileName.endsWith(extension)) {
+        if (fileExt.equals("")) {
             fileName += extension;
-        }
+        }        
 
         inputStream = getClass().getClassLoader().getResourceAsStream(
                 "hudson/plugins/emailext/templates/" + fileName);