Property loading falls back to default classloader when context classloader is not set correctly, e.g. in OSGi environments

Paul Bakker · Paul Bakker · commit ad3cdbfe3900 · 2016-01-08T15:24:36.000+01:00
diff --git a/client/src/main/java/org/asynchttpclient/config/AsyncHttpClientConfigHelper.java b/client/src/main/java/org/asynchttpclient/config/AsyncHttpClientConfigHelper.java
@@ -47,6 +47,13 @@ private Properties parsePropertiesFile(String file) {
             try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(file)) {
                 if (is != null) {
                     props.load(is);
+                } else {
+                   //Try loading from this class classloader instead, e.g. for OSGi environments.
+                    try(InputStream is2 = this.getClass().getClassLoader().getResourceAsStream(file)) {
+                        if (is2 != null) {
+                            props.load(is2);
+                        }
+                    }
                 }
             } catch (IOException e) {
                 throw new IllegalArgumentException("Can't parse file", e);
