This commit is contained in:
Shinsuke Sugaya 2014-01-17 13:02:01 +09:00
parent a3202f9480
commit 3640a5eb5c
2 changed files with 6 additions and 1 deletions

View file

@ -103,7 +103,7 @@ public class ResourceUtil {
replacement = matcher.group(1);
}
matcher.appendReplacement(tunedText,
replacement.replace("$", "\\$"));
replacement.replace("\\", "\\\\").replace("$", "\\$"));
}
matcher.appendTail(tunedText);

View file

@ -74,6 +74,11 @@ public class ResourceUtilTest extends S2TestCase {
value = "${\\$}";
assertEquals(value, ResourceUtil.resolve(value));
System.setProperty("test.dir", "c:\\test1\\test2");
value = "${test.dir}";
assertEquals("c:\\test1\\test2", ResourceUtil.resolve(value));
}
}