From 0317910ad67c2d3bd26ca371a0bf5000e55700a1 Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Wed, 4 Mar 2020 09:58:39 -0500 Subject: [PATCH] Reuse RxJava built-in disposed Disposable --- reactive/kotlinx-coroutines-rx2/src/RxConvert.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/reactive/kotlinx-coroutines-rx2/src/RxConvert.kt b/reactive/kotlinx-coroutines-rx2/src/RxConvert.kt index 36e8dd955a..0be606ffc2 100644 --- a/reactive/kotlinx-coroutines-rx2/src/RxConvert.kt +++ b/reactive/kotlinx-coroutines-rx2/src/RxConvert.kt @@ -100,12 +100,7 @@ public fun ObservableSource.asFlow(): Flow = callbackFlow { } subscribe(observer) - awaitClose { disposableRef.getAndSet(Disposed)?.dispose() } -} - -private object Disposed : Disposable { - override fun isDisposed() = true - override fun dispose() = Unit + awaitClose { disposableRef.getAndSet(Disposables.disposed())?.dispose() } } /**