ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-05 02:03:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ndoe: Fix message duping on redelivery

Browse Source
This commit is contained in:
Andras Slemmer 2016-08-24 14:58:21 +01:00
parent 89a5448c39
commit cc556cde6f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
node/src/main/kotlin/com/r3corda/node/services/messaging/ArtemisMessagingClient.kt
View File

@ -86,7 +86,7 @@ class ArtemisMessagingClient(directory: Path,
private val handlers = CopyOnWriteArrayList<Handler>() private val handlers = CopyOnWriteArrayList<Handler>()
// TODO: This is not robust and needs to be replaced by more intelligently using the message queue server. // TODO: This is not robust and needs to be replaced by more intelligently using the message queue server.
private val undeliveredMessages = CopyOnWriteArrayList<Message>() private var undeliveredMessages = listOf<Message>()
init { init {
require(directory.fileSystem == FileSystems.getDefault()) { "Artemis only uses the default file system" } require(directory.fileSystem == FileSystems.getDefault()) { "Artemis only uses the default file system" }
@ -312,7 +312,9 @@ class ArtemisMessagingClient(directory: Path,
require(!topicSession.isBlank()) { "Topic must not be blank, as the empty topic is a special case." } require(!topicSession.isBlank()) { "Topic must not be blank, as the empty topic is a special case." }
val handler = Handler(executor, topicSession, callback) val handler = Handler(executor, topicSession, callback)
handlers.add(handler) handlers.add(handler)
undeliveredMessages.removeIf { deliver(it) } val messagesToRedeliver = undeliveredMessages
undeliveredMessages = listOf()
messagesToRedeliver.forEach { deliver(it) }
return handler return handler
} }