Fix client service loader on the android

ktorio · Sep 18, 2018 · 330ed1e · 330ed1e
1 parent 4d077f6
commit 330ed1e
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/ktor-client/ktor-client-core/ktor-client-core-jvm/src/io/ktor/client/HttpClientJvm.kt b/ktor-client/ktor-client-core/ktor-client-core-jvm/src/io/ktor/client/HttpClientJvm.kt
@@ -13,7 +13,12 @@ interface HttpClientEngineContainer {
     val factory: HttpClientEngineFactory<*>
 }
 
-private val FACTORY = ServiceLoader.load(HttpClientEngineContainer::class.java)
-    .toList()
-    .firstOrNull()
-    ?.factory ?: error("Failed to find HttpClientEngineContainer in classpath via ServiceLoader")
+/**
+ * Workaround for dummy android [ClassLoader].
+ */
+private val engines: List<HttpClientEngineContainer> = HttpClientEngineContainer::class.java.let {
+    ServiceLoader.load(it, it.classLoader).toList()
+}
+
+private val FACTORY = engines.firstOrNull()?.factory
+    ?: error("Failed to find HttpClientEngineContainer in classpath via ServiceLoader")