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

remove a check for a null in fromBasename that no longer happens

Browse Source
This commit is contained in:
Havoc Pennington 2011-12-07 09:26:57 -05:00
parent 0582f33d94
commit 10e61d1bcd
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/src/main/java/com/typesafe/config/impl/ConfigImpl.java
View File

@ -40,12 +40,7 @@ public class ConfigImpl {
|| name.endsWith(".properties")) { || name.endsWith(".properties")) {
ConfigParseable p = source.nameToParseable(name); ConfigParseable p = source.nameToParseable(name);
if (p != null) { obj = p.parse(p.options().setAllowMissing(options.getAllowMissing()));
obj = p.parse(p.options().setAllowMissing(
options.getAllowMissing()));
} else {
obj = SimpleConfigObject.emptyMissing(SimpleConfigOrigin.newSimple(name));
}
} else { } else {
ConfigParseable confHandle = source.nameToParseable(name + ".conf"); ConfigParseable confHandle = source.nameToParseable(name + ".conf");
ConfigParseable jsonHandle = source.nameToParseable(name + ".json"); ConfigParseable jsonHandle = source.nameToParseable(name + ".json");