minor: replace Pair with data class in daemon client connectAndLease call

backport from 1.0.7
2017-03-13 12:07:24 +01:00
parent 4b430b49a7
commit 4043f491da
3 changed files with 10 additions and 9 deletions
@@ -425,13 +425,13 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
                        val daemonWithSession = KotlinCompilerClient.connectAndLease(compilerId, flagFile, daemonJVMOptions, daemonOptions,
                                                                                     DaemonReportingTargets(out = System.err), autostart = true,
                                                                                     leaseSession = true, sessionAliveFlagFile = sessionFlagFile)
-                        if (daemonWithSession?.first == null) {
+                        if (daemonWithSession?.service == null) {
                            fail("failed to connect daemon:\n${logFile.readLines().joinToString("\n")}\n------")
                        }
                        val jar = tmpdir.absolutePath + File.separator + "hello.$threadNo.jar"
                        val res = KotlinCompilerClient.compile(
-                                daemonWithSession!!.first,
-                                daemonWithSession.second,
+                                daemonWithSession!!.service,
+                                daemonWithSession.sessionId,
                                CompileService.TargetPlatform.JVM,
                                arrayOf(File(getHelloAppBaseDir(), "hello.kt").absolutePath, "-d", jar),
                                outStreams[threadNo])