Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing double '2152' expand

This commit is contained in:
Joakim Erdfelt 2013-12-26 13:02:10 -07:00
parent 4777f4ff3b
commit fa399d4b7d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-start/src/main/java/org/eclipse/jetty/start/Props.java
View File

@ -155,7 +155,7 @@ public final class Props implements Iterable<Prop>
// special case for "$$"
if (expanded.indexOf("$$") >= 0)
{
return expanded.toString().replace("\\$\\$","\\$");
return expanded.toString().replaceAll("\\$\\$","\\$");
}
return expanded.toString();

12
jetty-start/src/test/java/org/eclipse/jetty/start/PropsTest.java
View File

@ -68,13 +68,13 @@ public class PropsTest
{
Props props = new Props();
props.setProperty("name","jetty",FROM_TEST);
props.setProperty("name","projetty","(Pro-Jetty)");
props.setProperty("name","altjetty","(Alt-Jetty)");
String prefix = "Overriden";
assertThat(prefix,props.getString("name"),is("projetty"));
assertThat(prefix,props.getString("name"),is("altjetty"));
Prop prop = props.getProp("name");
assertProp(prefix,prop,"name","projetty","(Pro-Jetty)");
assertProp(prefix,prop,"name","altjetty","(Alt-Jetty)");
Prop older = prop.overrides;
assertThat(prefix + ".overrides",older,notNullValue());
assertProp(prefix + ".overridden",older,"name","jetty",FROM_TEST);
@ -97,12 +97,12 @@ public class PropsTest
public void testNoExpandDoubleDollar()
{
Props props = new Props();
props.setProperty("http.port","8080",FROM_TEST);
props.setProperty("aa","123",FROM_TEST);
// Should NOT expand double $$ symbols
assertThat(props.expand("port=$${http.port}"),is("port=$${http.port}"));
assertThat(props.expand("zz=$${aa}"),is("zz=${aa}"));
// Should expand
assertThat(props.expand("port=${http.port}"),is("port=8080"));
assertThat(props.expand("zz=${aa}"),is("zz=123"));
}
@Test