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

The Artemis reconnection logic failed in test, because there were active artemis bridge connections. Correct the integration test, fix the bridging code and log all onError cases in the bridge.

Browse Source
This commit is contained in:
Matthew Nesbit
2018-05-29 18:14:35 +01:00
parent 687b6080af
commit f98bf4db14
12 changed files with 106 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
View File

@ -110,9 +110,17 @@ class AMQPBridgeManager(config: NodeSSLConfiguration, private val socksProxyConf
log.info("Stopping AMQP bridge")
lock.withLock {
synchronized(artemis) {
consumer?.close()
consumer?.apply {
if (!isClosed) {
close()
}
}
consumer = null
session?.stop()
session?.apply {
if (!isClosed) {
stop()
}
}
session = null
}
}
@ -135,9 +143,17 @@ class AMQPBridgeManager(config: NodeSSLConfiguration, private val socksProxyConf
session.start()
} else {
log.info("Bridge Disconnected")
consumer?.close()
consumer?.apply {
if (!isClosed) {
close()
}
}
consumer = null
session?.stop()
session?.apply {
if (!isClosed) {
stop()
}
}
session = null
}
}