Fix JENKINS-14284

jenkinsci · Jul 2, 2012 · 2be7887 · 2be7887
1 parent e8105b8
commit 2be7887
Showing 1 changed file with 8 additions and 2 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,6 +39,7 @@ 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);
@@ -66,6 +67,8 @@ 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();
@@ -87,14 +90,17 @@ private String processProperty(Object prop) {
         if (prop == null) {
             return null;
         }
-        return processPath(String.valueOf(prop).trim());
+
+        return String.valueOf(prop).trim();
     }
 
     private String processPath(String content) {
         if (content == null) {
             return null;
         }
-        return content.replace("\\", "\\\\");
+
+        content = content.replace("\\", "\\\\");
+        return content.replace("\\\\\n", "\\\n");
     }
 
 }