ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-22 06:17:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Test fix and review fix.

Browse Source
This commit is contained in:
Clinton Alexander 2016-10-21 12:09:21 +01:00
parent 6cd692776f
commit 8f326824f3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/integration-test/kotlin/com/r3corda/client/CordaRPCClientTest.kt
View File

@ -25,8 +25,8 @@ class CordaRPCClientTest {
val driverStarted = CountDownLatch(1) val driverStarted = CountDownLatch(1)
driverThread = thread { driverThread = thread {
driver { driver {
val nodeInfo = startNode().get() val driverInfo = startNode().get()
client = CordaRPCClient(toHostAndPort(nodeInfo.address), configureTestSSL()) client = CordaRPCClient(toHostAndPort(driverInfo.nodeInfo.address), configureTestSSL())
driverStarted.countDown() driverStarted.countDown()
stopDriver.await() stopDriver.await()
} }

2
node/src/main/kotlin/com/r3corda/node/services/config/NodeConfiguration.kt
View File

@ -59,7 +59,7 @@ class FullNodeConfiguration(config: Config) : NodeConfiguration {
} }
if (networkMapAddress == null) advertisedServices.add(ServiceInfo(NetworkMapService.type)) if (networkMapAddress == null) advertisedServices.add(ServiceInfo(NetworkMapService.type))
val networkMapMessageAddress: SingleMessageRecipient? = if (networkMapAddress == null) null else NodeMessagingClient.makeNetworkMapAddress(networkMapAddress!!) 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) Node(this, networkMapMessageAddress, advertisedServices, Class.forName(clockClass).newInstance() as Clock)
} else { } else {
Node(this, networkMapMessageAddress, advertisedServices) Node(this, networkMapMessageAddress, advertisedServices)