From ef5faeaf26ddb41fb21b0ad132f71c9322fc34a6 Mon Sep 17 00:00:00 2001
From: Shams Asari <shams.asari@r3.com>
Date: Thu, 7 Jun 2018 18:14:44 +0100
Subject: [PATCH] Merge fix

---
 .../services/statemachine/MultiThreadedStateMachineManager.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt b/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt
index 4e06845d80..835238333a 100644
--- a/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt
+++ b/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt
@@ -102,6 +102,8 @@ class MultiThreadedStateMachineManager(
         val timedFlows = ConcurrentHashMap<StateMachineRunId, ScheduledTimeout>()
     }
 
+    override val flowHospital: StaffedFlowHospital = StaffedFlowHospital()
+
     private val concurrentBox = ConcurrentBox(InnerState())
 
     private val scheduler = FiberExecutorScheduler("Flow fiber scheduler", executor)
@@ -760,7 +762,7 @@ class MultiThreadedStateMachineManager(
 
     private fun makeTransitionExecutor(): TransitionExecutor {
         val interceptors = ArrayList<TransitionInterceptor>()
-        interceptors.add { HospitalisingInterceptor(StaffedFlowHospital, it) }
+        interceptors.add { HospitalisingInterceptor(flowHospital, it) }
         if (serviceHub.configuration.devMode) {
             interceptors.add { DumpHistoryOnErrorInterceptor(it) }
             interceptors.add { MetricInterceptor(metrics, it) }