From d95b1b0e6ab16f25e47a0e4f9b40182443c7b697 Mon Sep 17 00:00:00 2001 From: Rick Parker Date: Wed, 13 Jun 2018 13:31:18 +0100 Subject: [PATCH] CORDA-1622 Correct broken de-dup header logic on node restart for restored flows. Multi-threaded version. (#985) --- .../statemachine/MultiThreadedStateMachineManager.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt b/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt index c746a63356..8c1a1e8526 100644 --- a/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt +++ b/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt @@ -364,8 +364,7 @@ class MultiThreadedStateMachineManager( checkpoint = checkpoint, initialDeduplicationHandler = null, isAnyCheckpointPersisted = true, - isStartIdempotent = false, - senderUUID = null + isStartIdempotent = false ) } else { // Just flow initiation message @@ -664,8 +663,7 @@ class MultiThreadedStateMachineManager( checkpoint: Checkpoint, isAnyCheckpointPersisted: Boolean, isStartIdempotent: Boolean, - initialDeduplicationHandler: DeduplicationHandler?, - senderUUID: String? = ourSenderUUID + initialDeduplicationHandler: DeduplicationHandler? ): Flow { val flowState = checkpoint.flowState val resultFuture = openFuture() @@ -681,7 +679,7 @@ class MultiThreadedStateMachineManager( isStartIdempotent = isStartIdempotent, isRemoved = false, flowLogic = logic, - senderUUID = senderUUID + senderUUID = null ) val fiber = FlowStateMachineImpl(id, logic, scheduler) fiber.transientValues = TransientReference(createTransientValues(id, resultFuture)) @@ -700,7 +698,7 @@ class MultiThreadedStateMachineManager( isStartIdempotent = isStartIdempotent, isRemoved = false, flowLogic = fiber.logic, - senderUUID = senderUUID + senderUUID = null ) fiber.transientValues = TransientReference(createTransientValues(id, resultFuture)) fiber.transientState = TransientReference(state)