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

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

Browse Source 
("Could not initialize class Kotlin.Unit")

(cherry picked from commit b3a1311)
This commit is contained in:
Ilya Chernikov
2017-02-21 17:57:07 +03:00
parent 00e8dfe1be
commit fa5728b288
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt
+2 -1
View File
@@ -80,9 +80,10 @@ open class CompilerCallbackServicesFacadeServer(
override fun lookupTracker_isDoNothing(): Boolean = lookupTracker_isDoNothing override fun lookupTracker_isDoNothing(): Boolean = lookupTracker_isDoNothing
override fun compilationCanceledStatus_checkCanceled() { override fun compilationCanceledStatus_checkCanceled(): Void? {
try { try {
compilationCanceledStatus!!.checkCanceled() compilationCanceledStatus!!.checkCanceled()
return null
} }
catch (e: Exception) { catch (e: Exception) {
// avoid passing exceptions that may have different serialVersionUID on across rmi border // avoid passing exceptions that may have different serialVersionUID on across rmi border
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt
+1 -1
View File
@@ -81,7 +81,7 @@ interface CompilerCallbackServicesFacade : Remote {
// ---------------------------------------------------- // ----------------------------------------------------
// CompilationCanceledStatus // CompilationCanceledStatus
@Throws(RemoteException::class, RmiFriendlyCompilationCanceledException::class) @Throws(RemoteException::class, RmiFriendlyCompilationCanceledException::class)
fun compilationCanceledStatus_checkCanceled(): Unit fun compilationCanceledStatus_checkCanceled(): Void?
} }