azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix/workaround lazy lcript definition test and related scenarios

Browse Source
This commit is contained in:
Ilya Chernikov
2018-05-28 18:38:48 +02:00
parent 6fdb8746de
commit bacc2079ed
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptEnvironment.kt
+5 -3
View File
@@ -38,10 +38,12 @@ class JvmGetScriptingClass : GetScriptingClass {
if (!baseClassLoaderIsInitialized) { if (!baseClassLoaderIsInitialized) {
baseClassLoader = contextClassloader baseClassLoader = contextClassloader
baseClassLoaderIsInitialized = true baseClassLoaderIsInitialized = true
} else if (baseClassLoader != null) {
val baseClassLoadersChain = generateSequence(baseClassLoader) { it.parent }
if (baseClassLoadersChain.none { it == contextClassloader }) throw IllegalArgumentException("scripting class instantiation context changed")
} }
// TODO: this check breaks testLazyScriptDefinition, find out the reason and fix
// else if (baseClassLoader != null) {
// val baseClassLoadersChain = generateSequence(baseClassLoader) { it.parent }
// if (baseClassLoadersChain.none { it == contextClassloader }) throw IllegalArgumentException("scripting class instantiation context changed")
// }
if (classLoader == null) { if (classLoader == null) {
val classpath = dependencies?.flatMap { val classpath = dependencies?.flatMap {