Use Void instead of Unit in RMI calls, should fix EA-82064

("Could not initialize class Kotlin.Unit")
JetBrains · Feb 22, 2017 · b3a1311 · b3a1311
1 parent b604f0d
commit b3a1311
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...mon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt b/...mon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt
@@ -79,9 +79,10 @@ open class CompilerCallbackServicesFacadeServer(
 
     override fun lookupTracker_isDoNothing(): Boolean = lookupTracker_isDoNothing
 
-    override fun compilationCanceledStatus_checkCanceled() {
+    override fun compilationCanceledStatus_checkCanceled(): Void? {
         try {
             compilationCanceledStatus!!.checkCanceled()
+            return null
         }
         catch (e: ProcessCanceledException) {
             // avoid passing exceptions that may have different serialVersionUID on across rmi border

diff --git a/...on/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt b/...on/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt
@@ -80,7 +80,7 @@ interface CompilerCallbackServicesFacade : Remote {
     // ----------------------------------------------------
     // CompilationCanceledStatus
     @Throws(RemoteException::class, RmiFriendlyCompilationCanceledException::class)
-    fun compilationCanceledStatus_checkCanceled(): Unit
+    fun compilationCanceledStatus_checkCanceled(): Void?
 }