From 5302470f6b0d37efb86ae88723964337ede2c936 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Wed, 16 Jan 2019 13:58:38 +0300 Subject: [PATCH] Fix "testUnresolvedDependency" This fix is work-around fixing incompatibility issue between gradle tooling api bundled in IDEA and gradle tooling api in gradle 4.x. When null messages were logged it resulted in the following error: "java.io.StreamCorruptedException: invalid stream header: ED000573" --- idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt | 2 +- .../src/KotlinMPPGradleModelBuilder.kt.181 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt index b184952f269..0db979abdac 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt @@ -273,7 +273,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { private fun safelyGetArguments(compileKotlinTask: Task, accessor: Method?) = try { accessor?.invoke(compileKotlinTask) as? List } catch (e: Exception) { - logger.info(e.message, e) + logger.info(e.message ?: "Unexpected exception: $e", e) null } ?: emptyList() diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt.181 b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt.181 index 909e1d9fb02..a7ff5effc27 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt.181 +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt.181 @@ -264,7 +264,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { private fun safelyGetArguments(compileKotlinTask: Task, accessor: Method?) = try { accessor?.invoke(compileKotlinTask) as? List } catch (e: Exception) { - logger.info(e.message, e) + logger.info(e.message ?: "Unexpected exception: $e", e) null } ?: emptyList()