From 7bc81f68b44ad17fe5929162d9f2a7dc33e9e4e6 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 25 Feb 2015 17:48:11 +0300 Subject: [PATCH] Fix a bug in PluginURLClassLoader --- .../cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt index 4d6960394f1..d4938894cf1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt @@ -116,6 +116,11 @@ private class PluginURLClassLoader(urls: Array, parent: ClassLoader) : Clas private class SelfThenParentURLClassLoader(urls: Array, val onFail: ClassLoader) : URLClassLoader(urls, null) { public override fun findClass(name: String): Class<*> { + val loaded = findLoadedClass(name) + if (loaded != null) { + return loaded + } + return try { super.findClass(name) } catch (e: ClassNotFoundException) {