ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-08 03:44:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed merge conflict.

Browse Source
This commit is contained in:
Clinton Alexander 2016-10-20 14:14:59 +01:00
parent 1d6b8de11e
commit 622b5cabf7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,9 +309,9 @@ open class DriverDSL(
)
)
return Executors.newSingleThreadExecutor().submit(Callable<NodeInfo> {
return Executors.newSingleThreadExecutor().submit(Callable<DriverNodeInfo> {
registerProcess(DriverDSL.startNode(config, quasarJarPath, debugPort))
queryNodeInfo(apiAddress)!!
DriverNodeInfo(queryNodeInfo(apiAddress)!!, messagingAddress, apiAddress)
})
}