ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-24 15:16:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed merge error causing IRSDemo to fail.

Browse Source
This commit is contained in:
Clinton Alexander 2016-06-09 10:21:27 +01:00 committed by Andras Slemmer
parent a7ac54f280
commit 10fa86002d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/com/r3corda/demos/IRSDemo.kt
View File

@ -286,7 +286,7 @@ private fun sendJson(url: URL, data: String, method: String) : Boolean {
connection.useCaches = false connection.useCaches = false
connection.requestMethod = method connection.requestMethod = method
connection.connectTimeout = 5000 connection.connectTimeout = 5000
connection.readTimeout = 10000 connection.readTimeout = 15000
connection.setRequestProperty("Connection", "Keep-Alive") connection.setRequestProperty("Connection", "Keep-Alive")
connection.setRequestProperty("Cache-Control", "no-cache") connection.setRequestProperty("Cache-Control", "no-cache")
connection.setRequestProperty("Content-Type", "application/json") connection.setRequestProperty("Content-Type", "application/json")
@ -438,13 +438,13 @@ private fun startDemoNode(params : NodeParams) : Node {
val myNetAddr = HostAndPort.fromString(params.address).withDefaultPort(Node.DEFAULT_PORT) val myNetAddr = HostAndPort.fromString(params.address).withDefaultPort(Node.DEFAULT_PORT)
val networkMapId = if (params.mapAddress.equals(params.address)) { val networkMapId = if (params.mapAddress.equals(params.address)) {
// This node provides network map and notary services // This node provides network map and notary services
advertisedServices = setOf(NetworkMapService.Type, NotaryService.Type) advertisedServices = setOf(NetworkMapService.Type, SimpleNotaryService.Type)
null null
} else { } else {
advertisedServices = setOf(NodeInterestRates.Type) advertisedServices = setOf(NodeInterestRates.Type)
val handle = InMemoryMessagingNetwork.Handle(createNodeAParams().id, params.defaultLegalName) val handle = InMemoryMessagingNetwork.Handle(createNodeAParams().id, params.defaultLegalName)
nodeInfo(handle, params.identityFile, setOf(NetworkMapService.Type, NotaryService.Type)) nodeInfo(handle, params.identityFile, setOf(NetworkMapService.Type, SimpleNotaryService.Type))
} }
val messageService = messageNetwork.createNodeWithID(false, params.id).start().get() val messageService = messageNetwork.createNodeWithID(false, params.id).start().get()