ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-14 14:37:22 +00:00
Code Issues Actions2 Packages Projects Releases Wiki Activity

Address comments

Browse Source
This commit is contained in:
Andras Slemmer 2017-05-11 11:32:29 +01:00
parent 8a17406246
commit b192a86a30
4 changed files with 8 additions and 8 deletions
client/rpc/src
integration-test/kotlin/net/corda/client/rpc
RPCStabilityTests.kt
main/kotlin/net/corda/client/rpc/internal
RPCClientProxyHandler.kt
core/src/main/kotlin/net/corda/core/utilities
LifeCycle.kt
node/src/main/kotlin/net/corda/node/services/messaging
RPCServer.kt

10
client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt

@ -46,7 +46,7 @@ class RPCStabilityTests {
values.poll()
}
val first = values.peek()
if (values.size == 5 && values.all { it == first } ) {
if (values.size == 5 && values.all { it == first }) {
first
} else {
null
@ -63,11 +63,11 @@ class RPCStabilityTests {
startRpcClient<RPCOps>(server.get().hostAndPort).get()
}
}
for (i in 1 .. 5) {
repeat(5) {
startAndStop()
}
val numberOfThreadsBefore = waitUntilNumberOfThreadsStable(executor)
for (i in 1 .. 5) {
repeat(5) {
startAndStop()
}
val numberOfThreadsAfter = waitUntilNumberOfThreadsStable(executor)
@ -87,11 +87,11 @@ class RPCStabilityTests {
ErrorOr.catch { startRpcClient<RPCOps>(server.get().hostAndPort, configuration = RPCClientConfiguration.default.copy(minimumServerProtocolVersion = 1)).get() }
}
}
for (i in 1 .. 5) {
repeat(5) {
startAndStop()
}
val numberOfThreadsBefore = waitUntilNumberOfThreadsStable(executor)
for (i in 1 .. 5) {
repeat(5) {
startAndStop()
}
val numberOfThreadsAfter = waitUntilNumberOfThreadsStable(executor)

2
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt

@ -281,7 +281,7 @@ class RPCClientProxyHandler(
// leak borrowed executors.
val observationExecutors = observationExecutorPool.close()
observationExecutors.forEach { it.shutdownNow() }
lifeCycle.transition(State.FINISHED)
lifeCycle.justTransition(State.FINISHED)
}
/**

2
core/src/main/kotlin/net/corda/core/utilities/LifeCycle.kt

@ -37,7 +37,7 @@ class LifeCycle<S : Enum<S>>(initial: S) {
}
/** Transition the state to [to] without performing a current state check. */
fun transition(to: S) {
fun justTransition(to: S) {
lock.writeLock().withLock {
state = to
}

2
node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt

@ -184,7 +184,7 @@ class RPCServer(
it.session.close()
it.sessionFactory.close()
}
lifeCycle.transition(State.FINISHED)
lifeCycle.justTransition(State.FINISHED)
}
private fun bindingRemovalArtemisMessageHandler(artemisMessage: ClientMessage) {