Merge pull request #591 from corda/aslemmer-ENT-1647

ENT-1647: Ack duplicate messages
2024-12-28 00:38:55 +00:00 · 2018-03-21 18:45:09 +00:00 · 2018-03-21 18:45:09 +00:00 · 34d5f72f51
commit 34d5f72f51
parent ca010f881d 051583b4f5
2 changed files with 1 additions and 1 deletions
--- 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()
                }
            }
        }
--- 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()
            }
        }
    }