From 6210e45fbcbc670647d73d85882e05c2c0872bd8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 28 May 2014 21:03:36 +0400 Subject: [PATCH] Minor, improve test case for KT-1157 Multithreaded version was not working correctly and was throwing NPEs in the log sometimes --- .../testData/codegen/box/classes/kt1157.kt | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/compiler/testData/codegen/box/classes/kt1157.kt b/compiler/testData/codegen/box/classes/kt1157.kt index 0847651ea56..2bf146c508e 100644 --- a/compiler/testData/codegen/box/classes/kt1157.kt +++ b/compiler/testData/codegen/box/classes/kt1157.kt @@ -1,28 +1,17 @@ public object SomeClass { - var bug: Any = "" - - private val workerThread = object : Thread() { + private val work = object : Runnable { override fun run() { - try { - foo() - bug = "none" - } - catch(t: Throwable) { - bug = t - } + foo() } } - { - workerThread.start() + private fun foo(): Unit { } - private fun foo() : Unit { - } + public fun run(): Unit = work.run() } -public fun box():String { - if(SomeClass.bug is Throwable) - throw SomeClass.bug as Throwable +fun box(): String { + SomeClass.run() return "OK" }