From f92f7d8d56864734841167d8b637c67ececf4200 Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Fri, 21 Oct 2016 10:58:34 +0100 Subject: [PATCH] NodeSchedulerService no longer takes a default protocol logic ref factory (because otherwise no protocols are whitelisted) and instead now uses the one constructed in the node. --- node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt | 2 +- .../com/r3corda/node/services/events/NodeSchedulerService.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt b/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt index a9d023fe6b..59bcbf48d3 100644 --- a/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt @@ -209,7 +209,7 @@ abstract class AbstractNode(open val configuration: NodeConfiguration, val netwo // the identity key. But the infrastructure to make that easy isn't here yet. keyManagement = makeKeyManagementService() api = APIServerImpl(this@AbstractNode) - scheduler = NodeSchedulerService(database, services) + scheduler = NodeSchedulerService(database, services, protocolLogicFactory) protocolLogicFactory = initialiseProtocolLogicFactory() diff --git a/node/src/main/kotlin/com/r3corda/node/services/events/NodeSchedulerService.kt b/node/src/main/kotlin/com/r3corda/node/services/events/NodeSchedulerService.kt index 2c30c44044..f979476801 100644 --- a/node/src/main/kotlin/com/r3corda/node/services/events/NodeSchedulerService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/events/NodeSchedulerService.kt @@ -45,7 +45,7 @@ import javax.annotation.concurrent.ThreadSafe @ThreadSafe class NodeSchedulerService(private val database: Database, private val services: ServiceHubInternal, - private val protocolLogicRefFactory: ProtocolLogicRefFactory = ProtocolLogicRefFactory(), + private val protocolLogicRefFactory: ProtocolLogicRefFactory, private val schedulerTimerExecutor: Executor = Executors.newSingleThreadExecutor()) : SchedulerService, SingletonSerializeAsToken() {