Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(autoclose): close Closeables in reversed order #3387

Merged
merged 3 commits into from
Mar 5, 2024
Merged

fix(autoclose): close Closeables in reversed order #3387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f84207f
fix(autoclose): close closeables in reversed order
hoc081098 Mar 2, 2024
252c730
fix(autoclose): close closeables in reversed order
hoc081098 Mar 2, 2024
e938ffe
fix test: suppressedExceptions
hoc081098 Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arrow-libs/core/arrow-autoclose/src/commonMain/kotlin/arrow/AutoCloseScope.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ internal class DefaultAutoCloseScope : AutoCloseScope {
}

fun close(error: Throwable?): Nothing? {
return finalizers.get().fold(error) { acc, function ->
return finalizers.get().asReversed().fold(error) { acc, function ->
acc.add(runCatching { function.invoke(error) }.exceptionOrNull())
}?.let { throw it }
}
Expand Down
40 changes: 39 additions & 1 deletion arrow-libs/core/arrow-autoclose/src/commonTest/kotlin/arrow/AutoCloseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import arrow.atomic.AtomicBoolean
import io.kotest.assertions.throwables.shouldThrow
import io.kotest.matchers.shouldBe
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.channels.toList
import kotlinx.coroutines.test.runTest
import kotlin.coroutines.cancellation.CancellationException
import kotlin.test.Test
Expand Down Expand Up @@ -76,7 +78,7 @@ class AutoCloseTest {
}

e shouldBe error
e.suppressedExceptions shouldBe listOf(error2, error3)
e.suppressedExceptions shouldBe listOf(error3, error2)
promise.await() shouldBe error
wasActive.await() shouldBe true
res.isActive() shouldBe false
Expand Down Expand Up @@ -134,6 +136,42 @@ class AutoCloseTest {
res.isActive() shouldBe false
}

@Test
fun closeInReversedOrder() = runTest {
val res1 = Resource()
val res2 = Resource()
val res3 = Resource()

val wasActive = Channel<Boolean>(Channel.UNLIMITED)
val closed = Channel<Resource>(Channel.UNLIMITED)

autoCloseScope {
val r1 = autoClose({ res1 }) { r, _ ->
closed.trySend(r).getOrThrow()
r.shutdown()
}
val r2 = autoClose({ res2 }) { r, _ ->
closed.trySend(r).getOrThrow()
r.shutdown()
}
val r3 = autoClose({ res3 }) { r, _ ->
closed.trySend(r).getOrThrow()
r.shutdown()
}

wasActive.trySend(r1.isActive()).getOrThrow()
wasActive.trySend(r2.isActive()).getOrThrow()
wasActive.trySend(r3.isActive()).getOrThrow()
wasActive.close()
}

wasActive.toList() shouldBe listOf(true, true, true)
closed.receive() shouldBe res3
closed.receive() shouldBe res2
closed.receive() shouldBe res1
closed.cancel()
}

@OptIn(ExperimentalStdlibApi::class)
private class Resource : AutoCloseable {
private val isActive = AtomicBoolean(true)
Expand Down