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

INFRA-438: Close session factory before closing the locator (#6477)

Browse Source
This commit is contained in:
Yiftach Kaplan 2020-07-21 18:10:09 +01:00 committed by GitHub
parent 1924e5a7d1
commit a03fb8c6fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,7 @@ class P2PMessagingClient(val config: NodeConfiguration,
var bridgeSession: ClientSession? = null var bridgeSession: ClientSession? = null
var bridgeNotifyConsumer: ClientConsumer? = null var bridgeNotifyConsumer: ClientConsumer? = null
var networkChangeSubscription: Subscription? = null var networkChangeSubscription: Subscription? = null
var sessionFactory: ClientSessionFactory? = null
fun sendMessage(address: String, message: ClientMessage) = producer!!.send(address, message) fun sendMessage(address: String, message: ClientMessage) = producer!!.send(address, message)
} }
@ -172,7 +173,7 @@ class P2PMessagingClient(val config: NodeConfiguration,
minLargeMessageSize = maxMessageSize + JOURNAL_HEADER_SIZE minLargeMessageSize = maxMessageSize + JOURNAL_HEADER_SIZE
isUseGlobalPools = nodeSerializationEnv != null isUseGlobalPools = nodeSerializationEnv != null
} }
val sessionFactory = locator!!.createSessionFactory().addFailoverListener(::failoverCallback) sessionFactory = locator!!.createSessionFactory().addFailoverListener(::failoverCallback)
// Login using the node username. The broker will authenticate us as its node (as opposed to another peer) // Login using the node username. The broker will authenticate us as its node (as opposed to another peer)
// using our TLS certificate. // using our TLS certificate.
// Note that the acknowledgement of messages is not flushed to the Artermis journal until the default buffer // Note that the acknowledgement of messages is not flushed to the Artermis journal until the default buffer
@ -490,8 +491,10 @@ class P2PMessagingClient(val config: NodeConfiguration,
// Wait for the main loop to notice the consumer has gone and finish up. // Wait for the main loop to notice the consumer has gone and finish up.
shutdownLatch.await() shutdownLatch.await()
} }
// Only first caller to gets running true to protect against double stop, which seems to happen in some integration tests. // Only first caller to gets running true to protect against double stop, which seems to happen in some integration tests.
state.locked { state.locked {
sessionFactory?.close()
locator?.close() locator?.close()
} }
} }