From 616bf3db5ec6da6d28cb38fa571cf9d94a19dc5b Mon Sep 17 00:00:00 2001
From: William Vigor <58432369+williamvigorr3@users.noreply.github.com>
Date: Wed, 3 Jul 2024 09:57:25 +0100
Subject: [PATCH] CORE-20738 Close the registration before closing the
 subscription (#6229)

This fixes a spurious error in the logs about a registration not being closed.
---
 .../lifecycle/domino/logic/util/SubscriptionDominoTileBase.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/domino-logic/src/main/kotlin/net/corda/lifecycle/domino/logic/util/SubscriptionDominoTileBase.kt b/components/domino-logic/src/main/kotlin/net/corda/lifecycle/domino/logic/util/SubscriptionDominoTileBase.kt
index 70eb443ebc9..79aea1fcacd 100644
--- a/components/domino-logic/src/main/kotlin/net/corda/lifecycle/domino/logic/util/SubscriptionDominoTileBase.kt
+++ b/components/domino-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()
     }