Move FastJarFileSystem to ProjectEnvironment and link to the root disposable
This commit is contained in:
committed by
TeamCityServer
parent
3afed7f972
commit
d6adac8dd0
@@ -1204,7 +1204,6 @@ class CompileServiceImpl(
|
||||
override fun clearJarCache() {
|
||||
ZipHandler.clearFileAccessorCache()
|
||||
(KotlinCoreEnvironment.applicationEnvironment?.jarFileSystem as? CoreJarFileSystem)?.clearHandlersCache()
|
||||
(KotlinCoreEnvironment.applicationEnvironment?.jarFileSystem as? FastJarFileSystem)?.clearHandlersCache()
|
||||
}
|
||||
|
||||
private inline fun <R> ifAlive(
|
||||
|
||||
@@ -66,7 +66,8 @@ abstract class KotlinJvmReplServiceBase(
|
||||
val projectEnvironment =
|
||||
KotlinCoreEnvironment.ProjectEnvironment(
|
||||
disposable,
|
||||
KotlinCoreEnvironment.getOrCreateApplicationEnvironmentForProduction(disposable, configuration)
|
||||
KotlinCoreEnvironment.getOrCreateApplicationEnvironmentForProduction(disposable, configuration),
|
||||
configuration,
|
||||
)
|
||||
ReplFactoryExtension.registerExtensionPoint(projectEnvironment.project)
|
||||
projectEnvironment.registerExtensionsFromPlugins(configuration)
|
||||
@@ -223,4 +224,4 @@ fun CompilerConfiguration.configureScripting(compilerId: CompilerId) {
|
||||
error
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-1
@@ -670,7 +670,6 @@ class CompileServiceServerSideImpl(
|
||||
override suspend fun clearJarCache() {
|
||||
ZipHandler.clearFileAccessorCache()
|
||||
(KotlinCoreEnvironment.applicationEnvironment?.jarFileSystem as? CoreJarFileSystem)?.clearHandlersCache()
|
||||
(KotlinCoreEnvironment.applicationEnvironment?.jarFileSystem as? FastJarFileSystem)?.clearHandlersCache()
|
||||
}
|
||||
|
||||
private suspend fun <R> ifAlive(
|
||||
|
||||
Reference in New Issue
Block a user