From 10fa86002d447a1469991bcca54fc5ee30124691 Mon Sep 17 00:00:00 2001
From: Clinton Alexander <clinton.alexander@r3cev.com>
Date: Thu, 9 Jun 2016 10:21:27 +0100
Subject: [PATCH] Fixed merge error causing IRSDemo to fail.

---
 src/main/kotlin/com/r3corda/demos/IRSDemo.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/com/r3corda/demos/IRSDemo.kt b/src/main/kotlin/com/r3corda/demos/IRSDemo.kt
index 0dacb98323..ba7f1884c3 100644
--- a/src/main/kotlin/com/r3corda/demos/IRSDemo.kt
+++ b/src/main/kotlin/com/r3corda/demos/IRSDemo.kt
@@ -286,7 +286,7 @@ private fun sendJson(url: URL, data: String, method: String) : Boolean {
     connection.useCaches = false
     connection.requestMethod = method
     connection.connectTimeout = 5000
-    connection.readTimeout = 10000
+    connection.readTimeout = 15000
     connection.setRequestProperty("Connection", "Keep-Alive")
     connection.setRequestProperty("Cache-Control", "no-cache")
     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 networkMapId = if (params.mapAddress.equals(params.address)) {
         // This node provides network map and notary services
-        advertisedServices = setOf(NetworkMapService.Type, NotaryService.Type)
+        advertisedServices = setOf(NetworkMapService.Type, SimpleNotaryService.Type)
         null
     } else {
         advertisedServices = setOf(NodeInterestRates.Type)
 
         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()