Skip to content
Permalink
Browse files

Fix JENKINS-14232

  • Loading branch information
gboissinot committed Jun 29, 2012
1 parent dacae28 commit 3e05be8be28ed213858e97df30bd7db71aa7d789
Showing with 1 addition and 4 deletions.
  1. +1 −4 src/main/java/org/jenkinsci/plugins/envinject/service/PropertiesLoader.java
@@ -39,7 +39,6 @@
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 @@
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) {

0 comments on commit 3e05be8

Please sign in to comment.
You can’t perform that action at this time.