From 9f0ef0157eb65b99ee83e4dc96d097bc34e70701 Mon Sep 17 00:00:00 2001 From: Andras Slemmer Date: Wed, 21 Mar 2018 15:31:54 +0000 Subject: [PATCH 1/2] ACK duplicate messages --- .../net/corda/node/services/messaging/MessagingExecutor.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt b/node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt index 62ccababa6..bdd3a81f77 100644 --- a/node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt +++ b/node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt @@ -134,7 +134,6 @@ class MessagingExecutor( if (job is Job.Send) { job.sentFuture.setException(exception) } - session.rollback() } } } From 051583b4f552896cd91ebde93f207c4acbb9bc9d Mon Sep 17 00:00:00 2001 From: Andras Slemmer Date: Wed, 21 Mar 2018 15:32:11 +0000 Subject: [PATCH 2/2] Remove spurious session rollback --- .../net/corda/node/services/messaging/P2PMessagingClient.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt b/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt index d87ad36f9c..c85e9cd8e8 100644 --- a/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt +++ b/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt @@ -448,6 +448,7 @@ class P2PMessagingClient(val config: NodeConfiguration, deliver(cordaMessage, artemisMessage) } else { log.trace { "Discard duplicate message ${cordaMessage.uniqueMessageId} for ${cordaMessage.topic}" } + artemisMessage.individualAcknowledge() } } }