mirror of
https://github.com/apache/struts.git
synced 2026-08-07 07:37:20 +00:00
Merge pull request #977 from stefansielaff/fix-behavior-of-envsvaluesubstitutor
WW-5437 Swap order of sysStrSubstitutor and envStrSubstitutor in substitute method
This commit is contained in:
+2
-2
@@ -46,7 +46,7 @@ public class EnvsValueSubstitutor implements ValueSubstitutor {
|
||||
public String substitute(String value) {
|
||||
LOG.debug("Substituting value {} with proper System variable or environment variable", value);
|
||||
|
||||
String substituted = sysStrSubstitutor.replace(value);
|
||||
return envStrSubstitutor.replace(substituted);
|
||||
String substituted = envStrSubstitutor.replace(value);
|
||||
return sysStrSubstitutor.replace(substituted);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user