github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-01-15 23:01:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

throw proper ConfigException if EOF occurs before a ${} token ends

Browse Source 
It was throwing because -1 was passed to a %c format string
This commit is contained in:
Havoc Pennington 2011-12-09 10:12:01 -05:00
parent 694dd9bef5
commit aa8a258b59
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/main/java/com/typesafe/config/impl/Tokenizer.java
View File

@ -36,6 +36,8 @@ final class Tokenizer {
return "newline"; return "newline";
else if (codepoint == '\t') else if (codepoint == '\t')
return "tab"; return "tab";
else if (codepoint == -1)
return "end of file";
else if (Character.isISOControl(codepoint)) else if (Character.isISOControl(codepoint))
return String.format("control character 0x%x", codepoint); return String.format("control character 0x%x", codepoint);
else else

4
config/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala
View File

@ -167,7 +167,9 @@ class TokenizerTest extends TestUtils {
"\"\\u\"", // too short "\"\\u\"", // too short
"\"", // just a single quote "\"", // just a single quote
""" "abcdefg""", // no end quote """ "abcdefg""", // no end quote
"""\"\""" // file ends with a backslash """\"\""", // file ends with a backslash
"$", // file ends with a $
"${" // file ends with a ${
) )
for (t <- invalidTests) { for (t <- invalidTests) {