[IC] Fix RecoverableCompilationTransaction wasn't throwing an exception properly

#KT-56052 In Progress
2023-01-30 21:18:33 +01:00
parent 83ea1ca3cf
commit 8825cf7bf6
1 changed files with 9 additions and 5 deletions
@@ -240,17 +240,21 @@ class RecoverableCompilationTransaction(

    override fun close() {
        val mainException = closeCachesManager()
-
-        try {
+        val exceptionToThrow = runCatching {
            if (isSuccessful) {
                cleanupStash()
            } else {
                revertChanges()
                cleanupStash()
            }
-        } catch (t: Throwable) {
-            mainException?.addSuppressed(t)
-            throw mainException ?: t
+        }.exceptionOrNull().run {
+            if (this != null) {
+                mainException?.addSuppressed(this)
+            }
+            mainException ?: this
+        }
+        if (exceptionToThrow != null) {
+            throw exceptionToThrow
        }
    }
 }