From 05b6d8ab811846cba83ff798a705ae7872564b80 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Mon, 3 Apr 2017 14:33:05 +0300 Subject: [PATCH] Synchronized Any?.plus with JVM Kotlin --- runtime/src/main/kotlin/kotlin/String.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/main/kotlin/kotlin/String.kt b/runtime/src/main/kotlin/kotlin/String.kt index 74ff0defbdd..d4aa02b409b 100644 --- a/runtime/src/main/kotlin/kotlin/String.kt +++ b/runtime/src/main/kotlin/kotlin/String.kt @@ -59,7 +59,7 @@ public final class String : Comparable, CharSequence { private val kNullString = "null" public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String = - this?.plus(other?.toString() ?: kNullString) ?: other?.toString() ?: kNullString + (this?.toString() ?: kNullString).plus(other?.toString() ?: kNullString) public fun Any?.toString() = this?.toString() ?: kNullString \ No newline at end of file