From 10e61d1bcd4bd3d401cad01ec645dec31a506bce Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@pobox.com>
Date: Wed, 7 Dec 2011 09:26:57 -0500
Subject: [PATCH] remove a check for a null in fromBasename that no longer
 happens

---
 .../src/main/java/com/typesafe/config/impl/ConfigImpl.java | 7 +------
 1 file changed, 1 insertion(+), 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
index 77d0b189..3dc0a8fe 100644
--- 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 @@ public class ConfigImpl {
                 || 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");