From 8f326824f37efc004a8670124dc77d5798ced763 Mon Sep 17 00:00:00 2001
From: Clinton Alexander <clinton.alexander@r3cev.com>
Date: Fri, 21 Oct 2016 12:09:21 +0100
Subject: [PATCH] Test fix and review fix.

---
 .../kotlin/com/r3corda/client/CordaRPCClientTest.kt           | 4 ++--
 .../com/r3corda/node/services/config/NodeConfiguration.kt     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/integration-test/kotlin/com/r3corda/client/CordaRPCClientTest.kt b/client/src/integration-test/kotlin/com/r3corda/client/CordaRPCClientTest.kt
index 8db9fc9404..b60a4245fe 100644
--- a/client/src/integration-test/kotlin/com/r3corda/client/CordaRPCClientTest.kt
+++ b/client/src/integration-test/kotlin/com/r3corda/client/CordaRPCClientTest.kt
@@ -25,8 +25,8 @@ class CordaRPCClientTest {
         val driverStarted = CountDownLatch(1)
         driverThread = thread {
             driver {
-                val nodeInfo = startNode().get()
-                client = CordaRPCClient(toHostAndPort(nodeInfo.address), configureTestSSL())
+                val driverInfo = startNode().get()
+                client = CordaRPCClient(toHostAndPort(driverInfo.nodeInfo.address), configureTestSSL())
                 driverStarted.countDown()
                 stopDriver.await()
             }
diff --git a/node/src/main/kotlin/com/r3corda/node/services/config/NodeConfiguration.kt b/node/src/main/kotlin/com/r3corda/node/services/config/NodeConfiguration.kt
index 725c1a29c7..f9459db2f4 100644
--- a/node/src/main/kotlin/com/r3corda/node/services/config/NodeConfiguration.kt
+++ b/node/src/main/kotlin/com/r3corda/node/services/config/NodeConfiguration.kt
@@ -59,7 +59,7 @@ class FullNodeConfiguration(config: Config) : NodeConfiguration {
         }
         if (networkMapAddress == null) advertisedServices.add(ServiceInfo(NetworkMapService.type))
         val networkMapMessageAddress: SingleMessageRecipient? = if (networkMapAddress == null) null else NodeMessagingClient.makeNetworkMapAddress(networkMapAddress!!)
-        return if(clockClass != null) {
+        return if (clockClass != null) {
              Node(this, networkMapMessageAddress, advertisedServices, Class.forName(clockClass).newInstance() as Clock)
         } else {
             Node(this, networkMapMessageAddress, advertisedServices)