[CALCITE-3521] CalciteSystemProperty failed to load config file

apache · Nov 30, 2019 · 67e9367 · 67e9367
1 parent 82311f5
commit 67e9367
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/src/main/java/org/apache/calcite/config/CalciteSystemProperty.java b/core/src/main/java/org/apache/calcite/config/CalciteSystemProperty.java
@@ -16,6 +16,7 @@
  */
 package org.apache.calcite.config;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
 
 import java.io.File;
@@ -362,9 +363,11 @@ private static CalciteSystemProperty<String> stringProperty(
 
   private static Properties loadProperties() {
     Properties saffronProperties = new Properties();
+    ClassLoader classLoader = MoreObjects.firstNonNull(
+        Thread.currentThread().getContextClassLoader(),
+        CalciteSystemProperty.class.getClassLoader());
     // Read properties from the file "saffron.properties", if it exists in classpath
-    try (InputStream stream = CalciteSystemProperty.class.getClassLoader()
-        .getResourceAsStream("saffron.properties")) {
+    try (InputStream stream = classLoader.getResourceAsStream("saffron.properties")) {
       if (stream != null) {
         saffronProperties.load(stream);
       }