diff options
| author | Aditya Kishore <aditya@maprtech.com> | 2014-08-02 23:12:24 -0700 |
|---|---|---|
| committer | Jacques Nadeau <jacques@apache.org> | 2014-08-06 16:44:22 -0700 |
| commit | 711d621b4706c3586e256593909c7c154652a6a7 (patch) | |
| tree | ac1db3fdd9921ef349f183a3a4e3975b276f0271 /common | |
| parent | e71a5059f87aefc23a8e6811cbb5f078281c9549 (diff) | |
DRILL-632: JDBC single jar build failing, too many classes
Diffstat (limited to 'common')
| -rw-r--r-- | common/src/main/java/org/apache/drill/common/config/DrillConfig.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java index 0b2b22de0..ad3cb784e 100644 --- a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java +++ b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java @@ -33,6 +33,7 @@ import org.apache.drill.common.logical.FormatPluginConfigBase; import org.apache.drill.common.logical.StoragePluginConfigBase; import org.apache.drill.common.logical.data.LogicalOperatorBase; import org.apache.drill.common.util.PathScanner; +import org.reflections.util.ClasspathHelper; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser.Feature; @@ -138,7 +139,15 @@ public final class DrillConfig extends NestedConfig{ overrideFileName = overrideFileName == null ? CommonConstants.CONFIG_OVERRIDE : overrideFileName; // first we load defaults. - Config fallback = ConfigFactory.load(CommonConstants.CONFIG_DEFAULT); + Config fallback = null; + final ClassLoader[] classLoaders = ClasspathHelper.classLoaders(); + for (ClassLoader classLoader : classLoaders) { + if (classLoader.getResource(CommonConstants.CONFIG_DEFAULT) != null) { + fallback = ConfigFactory.load(classLoader, CommonConstants.CONFIG_DEFAULT); + break; + } + } + Collection<URL> urls = PathScanner.getConfigURLs(); logger.debug("Loading configs at the following URLs {}", urls); for (URL url : urls) { |