From 8689d022ca3024f198579232f5fb2570c172f72f Mon Sep 17 00:00:00 2001 From: Shams Asari Date: Mon, 23 Apr 2018 15:52:37 +0100 Subject: [PATCH] Merge fixes --- .../corda/node/services/statemachine/FlowStateMachineImpl.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt b/node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt index 3a4c2ea198..eabc9b641a 100644 --- a/node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt +++ b/node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt @@ -20,9 +20,7 @@ import net.corda.core.concurrent.CordaFuture import net.corda.core.context.InvocationContext import net.corda.core.flows.* import net.corda.core.identity.Party -import net.corda.core.internal.FlowIORequest -import net.corda.core.internal.FlowStateMachine -import net.corda.core.internal.uncheckedCast +import net.corda.core.internal.* import net.corda.core.serialization.SerializationContext import net.corda.core.serialization.serialize import net.corda.core.utilities.Try