[JENKINS-31162] Fixed how FreeStyleProject returns its IconFilePathPa…

…ttern
jenkinsci · Mar 23, 2016 · e3b11ae · e3b11ae
1 parent 3fe0a1e
commit e3b11ae
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/core/src/main/java/hudson/model/FreeStyleProject.java b/core/src/main/java/hudson/model/FreeStyleProject.java
@@ -26,6 +26,7 @@
 import hudson.Extension;
 import jenkins.model.Jenkins;
 import jenkins.model.item_category.StandaloneProjectsCategory;
+import org.apache.commons.lang.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -87,7 +88,11 @@ public String getCategoryId() {
 
         @Override
         public String getIconFilePathPattern() {
-            return Jenkins.RESOURCE_PATH + "images/:size/freestyleproject.png";
+            if (Jenkins.RESOURCE_PATH.isEmpty()) {
+                return "images/:size/freestyleproject.png";
+            } else {
+                return Jenkins.RESOURCE_PATH.substring(1) + "/images/:size/freestyleproject.png";
+            }
         }
 
     }