Address #665, add more leak tests

This commit is contained in:
Andras Slemmer
2017-05-15 13:18:28 +01:00
parent b192a86a30
commit f445590cff
9 changed files with 191 additions and 72 deletions

View File

@ -456,10 +456,7 @@ class DriverDSL(
override fun shutdown() {
_shutdownManager?.shutdown()
_executorService?.apply {
shutdownNow()
require(awaitTermination(1, TimeUnit.SECONDS))
}
_executorService?.shutdownNow()
}
private fun establishRpc(nodeAddress: HostAndPort, sslConfig: SSLConfiguration): ListenableFuture<CordaRPCOps> {

View File

@ -173,15 +173,11 @@ class RPCServer(
rpcExecutor?.shutdownNow()
reaperExecutor?.shutdownNow()
sessionAndConsumers.forEach {
it.consumer.close()
it.session.close()
it.sessionFactory.close()
}
observableMap.invalidateAll()
reapSubscriptions()
sessionAndProducerPool.close().forEach {
it.producer.close()
it.session.close()
it.sessionFactory.close()
}
lifeCycle.justTransition(State.FINISHED)
@ -257,7 +253,6 @@ class RPCServer(
}
private fun reapSubscriptions() {
lifeCycle.requireState(State.STARTED)
observableMap.cleanUp()
}