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

node: Fix checking of lateinited networkMapNodeInfo

Browse Source
This commit is contained in:
Andras Slemmer
2016-08-04 15:26:19 +01:00
parent df4413ab68
commit 20fc200771
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
node/src/main/kotlin/com/r3corda/node/driver/Driver.kt
View File

@ -7,10 +7,10 @@ import com.r3corda.core.messaging.MessagingService
import com.r3corda.core.node.NodeInfo import com.r3corda.core.node.NodeInfo
import com.r3corda.core.node.services.NetworkMapCache import com.r3corda.core.node.services.NetworkMapCache
import com.r3corda.core.node.services.ServiceType import com.r3corda.core.node.services.ServiceType
import com.r3corda.node.services.config.NodeConfiguration
import com.r3corda.node.services.messaging.ArtemisMessagingClient import com.r3corda.node.services.messaging.ArtemisMessagingClient
import com.r3corda.node.services.config.NodeConfigurationFromConfig import com.r3corda.node.services.config.NodeConfigurationFromConfig
import com.r3corda.node.services.config.copy import com.r3corda.node.services.config.copy
import com.r3corda.node.services.messaging.ArtemisMessagingComponent
import com.r3corda.node.services.network.InMemoryNetworkMapCache import com.r3corda.node.services.network.InMemoryNetworkMapCache
import com.r3corda.node.services.network.NetworkMapService import com.r3corda.node.services.network.NetworkMapService
import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigFactory
@ -208,7 +208,7 @@ class DriverDSL(
override val networkMapCache = InMemoryNetworkMapCache(null) override val networkMapCache = InMemoryNetworkMapCache(null)
private val networkMapName = "NetworkMapService" private val networkMapName = "NetworkMapService"
private val networkMapAddress = portAllocation.nextHostAndPort() private val networkMapAddress = portAllocation.nextHostAndPort()
private lateinit var networkMapNodeInfo: NodeInfo private var networkMapNodeInfo: NodeInfo? = null
private val registeredProcesses = LinkedList<Process>() private val registeredProcesses = LinkedList<Process>()
val nodeConfiguration = val nodeConfiguration =
@ -256,7 +256,10 @@ class DriverDSL(
// Check that we shut down properly // Check that we shut down properly
addressMustNotBeBound(messagingService.myHostPort) addressMustNotBeBound(messagingService.myHostPort)
addressMustNotBeBound((networkMapNodeInfo.address as ArtemisMessagingService.Address).hostAndPort) val nodeInfo = networkMapNodeInfo
if (nodeInfo != null) {
addressMustNotBeBound((nodeInfo.address as ArtemisMessagingComponent.Address).hostAndPort)
}
} }
/** /**
@ -275,8 +278,8 @@ class DriverDSL(
val driverCliParams = NodeRunner.CliParams( val driverCliParams = NodeRunner.CliParams(
services = advertisedServices, services = advertisedServices,
networkMapName = networkMapNodeInfo.identity.name, networkMapName = networkMapNodeInfo!!.identity.name,
networkMapPublicKey = networkMapNodeInfo.identity.owningKey, networkMapPublicKey = networkMapNodeInfo!!.identity.owningKey,
networkMapAddress = networkMapAddress, networkMapAddress = networkMapAddress,
messagingAddress = messagingAddress, messagingAddress = messagingAddress,
apiAddress = apiAddress, apiAddress = apiAddress,
@ -297,6 +300,7 @@ class DriverDSL(
} }
override fun start() { override fun start() {
startNetworkMapService()
messagingService.configureWithDevSSLCertificate() messagingService.configureWithDevSSLCertificate()
messagingService.start() messagingService.start()
// We fake the network map's NodeInfo with a random public key in order to retrieve the correct NodeInfo from // We fake the network map's NodeInfo with a random public key in order to retrieve the correct NodeInfo from
@ -320,8 +324,6 @@ class DriverDSL(
} }
} }
private fun startNetworkMapService() { private fun startNetworkMapService() {
val apiAddress = portAllocation.nextHostAndPort() val apiAddress = portAllocation.nextHostAndPort()
val debugPort = debugPortAllocation.nextPort() val debugPort = debugPortAllocation.nextPort()