Merge pull request #977 from stefansielaff/fix-behavior-of-envsvaluesubstitutor

lukaszlenart · web-flow · commit 82b364d521bf · 2024-07-05T06:52:12.000+02:00
WW-5437 Swap order of sysStrSubstitutor and envStrSubstitutor in substitute method
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/EnvsValueSubstitutor.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/EnvsValueSubstitutor.java
@@ -46,7 +46,7 @@ public EnvsValueSubstitutor() {
     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);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public EnvsValueSubstitutor() {`
`46`	`46`	`public String substitute(String value) {`
`47`	`47`	`LOG.debug("Substituting value {} with proper System variable or environment variable", value);`
`48`	`48`
`49`		`- String substituted = sysStrSubstitutor.replace(value);`
`50`		`- return envStrSubstitutor.replace(substituted);`
	`49`	`+ String substituted = envStrSubstitutor.replace(value);`
	`50`	`+ return sysStrSubstitutor.replace(substituted);`
`51`	`51`	`}`
`52`	`52`	`}`