ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 16:58:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
ENT-1647: Ack duplicate messages
This commit is contained in:
Andras Slemmer 2018-03-21 18:45:09 +00:00 committed by GitHub
commit 34d5f72f51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt
View File

@ -134,7 +134,6 @@ class MessagingExecutor(
if (job is Job.Send) { if (job is Job.Send) {
job.sentFuture.setException(exception) job.sentFuture.setException(exception)
} }
session.rollback()
} }
} }
} }

1
node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
View File

@ -448,6 +448,7 @@ class P2PMessagingClient(val config: NodeConfiguration,
deliver(cordaMessage, artemisMessage) deliver(cordaMessage, artemisMessage)
} else { } else {
log.trace { "Discard duplicate message ${cordaMessage.uniqueMessageId} for ${cordaMessage.topic}" } log.trace { "Discard duplicate message ${cordaMessage.uniqueMessageId} for ${cordaMessage.topic}" }
artemisMessage.individualAcknowledge()
} }
} }
} }