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

havocp · Dec 7, 2011 · 10e61d1 · 10e61d1
1 parent 0582f33
commit 10e61d1
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigImpl.java b/config/src/main/java/com/typesafe/config/impl/ConfigImpl.java
@@ -40,12 +40,7 @@ private static ConfigObject fromBasename(NameSource source, String name,
                 || name.endsWith(".properties")) {
             ConfigParseable p = source.nameToParseable(name);
 
-            if (p != null) {
-                obj = p.parse(p.options().setAllowMissing(
-                        options.getAllowMissing()));
-            } else {
-                obj = SimpleConfigObject.emptyMissing(SimpleConfigOrigin.newSimple(name));
-            }
+            obj = p.parse(p.options().setAllowMissing(options.getAllowMissing()));
         } else {
             ConfigParseable confHandle = source.nameToParseable(name + ".conf");
             ConfigParseable jsonHandle = source.nameToParseable(name + ".json");