Close the registration before closing the subscription

corda · Jun 25, 2024 · 9af0ac5 · 9af0ac5
1 parent 5346e4e
commit 9af0ac5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...logic/src/main/kotlin/net/corda/lifecycle/domino/logic/util/SubscriptionDominoTileBase.kt b/...logic/src/main/kotlin/net/corda/lifecycle/domino/logic/util/SubscriptionDominoTileBase.kt
@@ -126,10 +126,11 @@ abstract class SubscriptionDominoTileBase(
     }
 
     private fun createAndStartSubscription() {
+        subscriptionRegistration.get()?.close()
         coordinator.createManagedResource(SUBSCRIPTION, subscriptionGenerator)
         val subscriptionName = coordinator.getManagedResource<SubscriptionBase>(SUBSCRIPTION)?.subscriptionName
             ?: throw CordaRuntimeException("Subscription could not be extracted from the lifecycle coordinator.")
-        subscriptionRegistration.getAndSet(coordinator.followStatusChangesByName(setOf(subscriptionName)))?.close()
+        subscriptionRegistration.getAndSet(coordinator.followStatusChangesByName(setOf(subscriptionName)))
         coordinator.getManagedResource<SubscriptionBase>(SUBSCRIPTION)?.start()
     }