From 1424bd16d0e21b04e9a252889ffdfa55d52caf76 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Fri, 14 Sep 2018 09:22:31 +0300 Subject: [PATCH] JPS: fix daemon RPC serialization #KT-26809 Fixed Original commit: 39c76c7b1171fc4e7b7ff0f44f4247f035989882 --- .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 3a815b5fd68..5a1f507706b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -76,7 +76,10 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { ): Set = withDaemonOrFallback( withDaemon = { doWithDaemon(environment) { sessionId, daemon -> - daemon.classesFqNamesByFiles(sessionId, files) + daemon.classesFqNamesByFiles( + sessionId, + files.toSet() // convert to standard HashSet to avoid serialization issues + ) } }, fallback = {