Skip to content
Permalink
Browse files

Fix JENKINS-12809

  • Loading branch information...
gboissinot committed Feb 19, 2012
1 parent 0f9ab22 commit 3f3ef659f51fc8b4e4004998343d56d24f84100c
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/main/java/org/jenkinsci/plugins/envinject/service/PropertiesLoader.java
@@ -38,8 +38,8 @@
SortedProperties properties = new SortedProperties();
try {
String fileContent = Util.loadFile(propertiesFile);
fileContent = processFilePath(fileContent);
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,7 +67,7 @@
return null;
}

content = processFilePath(content);
content = processPath(content);

Map<String, String> result = new LinkedHashMap<String, String>();
StringReader stringReader = new StringReader(content);
@@ -93,7 +93,7 @@ private String processProperty(Object prop) {
return String.valueOf(prop).trim();
}

private String processFilePath(String content) {
private String processPath(String content) {
if (content == null) {
return null;
}

0 comments on commit 3f3ef65

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