fix unnecessary check in recover()

respawn-app · Dec 21, 2023 · 244c297 · 244c297
1 parent 40369ca
commit 244c297
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/core/src/commonMain/kotlin/pro/respawn/flowmvi/modules/RecoverModule.kt b/core/src/commonMain/kotlin/pro/respawn/flowmvi/modules/RecoverModule.kt
@@ -35,8 +35,8 @@ internal fun interface RecoverModule<S : MVIState, I : MVIIntent, A : MVIAction>
         withContext(this@RecoverModule) { block() }
     } catch (expected: Exception) {
         when {
-            alreadyRecovered() -> throw RecursiveRecoverException(expected)
             expected is CancellationException || expected is UnrecoverableException -> throw expected
+            alreadyRecovered() -> throw RecursiveRecoverException(expected)
             else -> recover(expected)
         }
     }

diff --git a/core/src/commonMain/kotlin/pro/respawn/flowmvi/store/StoreImpl.kt b/core/src/commonMain/kotlin/pro/respawn/flowmvi/store/StoreImpl.kt
@@ -24,7 +24,6 @@ import pro.respawn.flowmvi.modules.RecoverModule
 import pro.respawn.flowmvi.modules.StateModule
 import pro.respawn.flowmvi.modules.SubscribersModule
 import pro.respawn.flowmvi.modules.actionModule
-import pro.respawn.flowmvi.modules.alreadyRecovered
 import pro.respawn.flowmvi.modules.intentModule
 import pro.respawn.flowmvi.modules.launchPipeline
 import pro.respawn.flowmvi.modules.observeSubscribers
@@ -83,7 +82,6 @@ internal class StoreImpl<S : MVIState, I : MVIIntent, A : MVIAction>(
     }
 
     override suspend fun PipelineContext<S, I, A>.recover(e: Exception) {
-        if (alreadyRecovered()) throw e
         withContext(this@StoreImpl) {
             onException(e)?.let { throw UnhandledStoreException(it) }
         }