github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-03-14 19:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

per review

Browse Source
This commit is contained in:
Ryan O'Neill 2015-08-14 12:24:12 -07:00
parent 2566973fdd
commit 6fede7cf73
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ public class ConfigConditional {
this.body = body;
if (this.left.optional()) {
throw new ConfigException.BugOrBroken("Substitutions in conditional expressions cannot be optional");
throw new ConfigException.BugOrBroken("Substitution " + this.left.toString() + " in conditional expression cannot be optional");
}
}

9
config/src/main/java/com/typesafe/config/impl/ConfigNodeConditional.java
View File

@ -28,14 +28,5 @@ final class ConfigNodeConditional extends AbstractConfigNode {
}
return tokens;
}
//
// protected String name() {
// for (AbstractConfigNode n : children) {
// if (n instanceof ConfigNodeSimpleValue) {
// return (String)Tokens.getValue(((ConfigNodeSimpleValue) n).token()).unwrapped();
// }
// }
// return null;
// }
}

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

@ -94,7 +94,7 @@ final class ConfigParser {
} else if (n instanceof ConfigNodeObject) {
v = parseObject((ConfigNodeObject)n);
} else if (n instanceof ConfigNodeArray) {
v = parseArray((ConfigNodeArray) n);
v = parseArray((ConfigNodeArray)n);
} else if (n instanceof ConfigNodeConcatenation) {
v = parseConcatenation((ConfigNodeConcatenation)n);
} else {