Fix JENKINS-14232

jenkinsci · Jun 29, 2012 · 3e05be8 · 3e05be8
1 parent dacae28
commit 3e05be8
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/envinject/service/PropertiesLoader.java b/src/main/java/org/jenkinsci/plugins/envinject/service/PropertiesLoader.java
@@ -39,7 +39,6 @@ public Map<String, String> getVarsFromPropertiesFile(File propertiesFile, Map<St
         try {
             String fileContent = Util.loadFile(propertiesFile);
             String fileContentResolved = Util.replaceMacro(fileContent, currentEnvVars);
-            fileContentResolved = processPath(fileContentResolved);
             properties.load(new StringReader(fileContentResolved));
         } catch (IOException ioe) {
             throw new EnvInjectException("Problem occurs on loading content", ioe);
@@ -67,8 +66,6 @@ public Map<String, String> getVarsFromPropertiesContent(String content) throws E
             return null;
         }
 
-        content = processPath(content);
-
         Map<String, String> result = new LinkedHashMap<String, String>();
         StringReader stringReader = new StringReader(content);
         SortedProperties properties = new SortedProperties();
@@ -90,7 +87,7 @@ private String processProperty(Object prop) {
         if (prop == null) {
             return null;
         }
-        return String.valueOf(prop).trim();
+        return processPath(String.valueOf(prop).trim());
     }
 
     private String processPath(String content) {