From b192a86a30b0ab19b5b87d066a8c9892765eafac Mon Sep 17 00:00:00 2001
From: Andras Slemmer <andras.slemmer@r3cev.com>
Date: Thu, 11 May 2017 11:32:29 +0100
Subject: [PATCH] Address comments #665

---
 .../kotlin/net/corda/client/rpc/RPCStabilityTests.kt   | 10 +++++-----
 .../corda/client/rpc/internal/RPCClientProxyHandler.kt |  2 +-
 .../main/kotlin/net/corda/core/utilities/LifeCycle.kt  |  2 +-
 .../net/corda/node/services/messaging/RPCServer.kt     |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt b/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
index 251fa11ff5..b325c0bc8f 100644
--- a/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
+++ b/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)
diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt
index 5a4e5c307e..3d5232481c 100644
--- a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt
+++ b/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)
     }
 
     /**
diff --git a/core/src/main/kotlin/net/corda/core/utilities/LifeCycle.kt b/core/src/main/kotlin/net/corda/core/utilities/LifeCycle.kt
index ba97af78e8..bc73e9f51a 100644
--- a/core/src/main/kotlin/net/corda/core/utilities/LifeCycle.kt
+++ b/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
         }
diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt b/node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt
index 9ebfec125c..693bbdf1e8 100644
--- a/node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt
+++ b/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) {