From ee70a64e1c0f4046c3f4e47fb3299cba8afb37a9 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 13 Jul 2017 15:18:14 +0300
Subject: [PATCH] Minor, template providers: don't create classloader for empty
 classpath

---
 .../script/scriptTemplateProviderExtensionPoint.kt    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
index 09ad372ab8a..c5149c4ec08 100644
--- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
+++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
@@ -70,9 +70,7 @@ fun makeScriptDefsFromTemplatesProviders(providers: Iterable<ScriptTemplatesProv
                                          errorsHandler: ((ScriptTemplatesProvider, Throwable) -> Unit) = { _, ex -> throw ex }
 ): List<KotlinScriptDefinition> = providers.flatMap { provider ->
     try {
-        val classpath = provider.dependenciesClasspath + provider.additionalResolverClasspath
-        LOG.info("[kts] loading script definitions ${provider.templateClassNames} using cp: ${classpath.joinToString(File.pathSeparator)}")
-        val loader = URLClassLoader(classpath.map { it.toURI().toURL() }.toTypedArray(), ScriptTemplatesProvider::class.java.classLoader)
+        val loader = createClassLoader(provider)
         provider.templateClassNames.map {
             KotlinScriptDefinitionFromAnnotatedTemplate(loader.loadClass(it).kotlin, provider.resolver, provider.filePattern, provider.environment)
         }
@@ -84,4 +82,11 @@ fun makeScriptDefsFromTemplatesProviders(providers: Iterable<ScriptTemplatesProv
     }
 }
 
+private fun createClassLoader(provider: ScriptTemplatesProvider): ClassLoader {
+    val classpath = provider.dependenciesClasspath + provider.additionalResolverClasspath
+    LOG.info("[kts] loading script definitions ${provider.templateClassNames} using cp: ${classpath.joinToString(File.pathSeparator)}")
+    val baseLoader = ScriptTemplatesProvider::class.java.classLoader
+    return if (classpath.isEmpty()) baseLoader else URLClassLoader(classpath.map { it.toURI().toURL() }.toTypedArray(), baseLoader)
+}
+
 private val LOG = Logger.getInstance("ScriptTemplatesProviders")