From 3793cb841bf79ad570b3c3f50567c8bd2abddf7c Mon Sep 17 00:00:00 2001
From: goapunk <goapunk@riseup.net>
Date: Wed, 23 May 2018 14:28:51 +0200
Subject: [PATCH] Fix test and poller instantiation
---
.../bramble/plugin/PluginManagerImpl.java | 14 +++++++-------
.../bramble/plugin/PluginManagerImplTest.java | 4 +---
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java
index a534eb357e..5b74eb4bef 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java
@@ -108,6 +108,13 @@ class PluginManagerImpl implements PluginManager, Service {
@Override
public void startService() throws ServiceException {
if (used.getAndSet(true)) throw new IllegalStateException();
+ // Instantiate the poller
+ if (pluginConfig.shouldPoll()) {
+ LOG.info("Starting poller");
+ Poller poller = new Poller(ioExecutor, scheduler, connectionManager,
+ connectionRegistry, this, random, clock);
+ eventBus.addListener(poller);
+ }
// Instantiate the simplex plugins and start them asynchronously
LOG.info("Starting simplex plugins");
for (SimplexPluginFactory f : pluginConfig.getSimplexFactories()) {
@@ -140,13 +147,6 @@ class PluginManagerImpl implements PluginManager, Service {
ioExecutor.execute(new PluginStarter(d, startLatch));
}
}
- // Instantiate the poller
- if (pluginConfig.shouldPoll()) {
- LOG.info("Starting poller");
- Poller poller = new Poller(ioExecutor, scheduler, connectionManager,
- connectionRegistry, this, random, clock);
- eventBus.addListener(poller);
- }
}
@Override
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java
index 958f1218df..2af1852a0d 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java
@@ -40,9 +40,7 @@ public class PluginManagerImplTest extends BrambleTestCase {
setThreadingPolicy(new Synchroniser());
}};
Executor ioExecutor = Executors.newSingleThreadExecutor();
- RejectedExecutionHandler policy =
- new ScheduledThreadPoolExecutor.DiscardPolicy();
- ScheduledExecutorService scheduler = new ScheduledThreadPoolExecutor(1, policy);
+ ScheduledExecutorService scheduler = context.mock(ScheduledExecutorService.class);
SecureRandom random = new SecureRandom();
Clock clock = context.mock(Clock.class);
EventBus eventBus = context.mock(EventBus.class);
--
GitLab