100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Publish on ClientEventService queue only if all routes are started (#2383)
Eric Bariaux0b465334e674
diff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java b/container/src/main/java/org/openremote/container/message/MessageBrokerService.javaindex ff2faf71f..c13a3194a 100644--- a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java+++ b/container/src/main/java/org/openremote/container/message/MessageBrokerService.java@@ -55,6 +55,8 @@ public class MessageBrokerService implements ContainerService {protected ProducerTemplate producerTemplate = context.createProducerTemplate();protected FluentProducerTemplate fluentProducerTemplate = context.createFluentProducerTemplate();+ private boolean isStarted = false;+@Overridepublic int getPriority() {return PRIORITY;@@ -66,7 +68,7 @@ public class MessageBrokerService implements ContainerService {// Not using InstrumentedThreadPoolFactory directly as it only uses the ThreadPoolProfile ID for namingThreadPoolFactory threadPoolFactory = new DefaultThreadPoolFactory() {- @Override+ @Overridepublic ExecutorService newThreadPool(ThreadPoolProfile profile, ThreadFactory threadFactory) {ExecutorService executorService;@@ -139,15 +141,24 @@ public class MessageBrokerService implements ContainerService {public void start(Container container) throws Exception {LOG.info("Starting Camel message broker");context.start();+ isStarted = true;}@Overridepublic void stop(Container container) throws Exception {- if (context != null) {- context.stop();+ try {+ if (context != null) {+ context.stop();+ }+ } finally {+ isStarted = false;}}+ public boolean isStarted() {+ return isStarted;+ }+public DefaultCamelContext getContext() {return context;}diff --git a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java b/manager/src/main/java/org/openremote/manager/event/ClientEventService.javaindex 7ea6d53c2..531b51bc4 100644--- a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java+++ b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java@@ -480,8 +480,8 @@ public class ClientEventService extends RouteBuilder implements ContainerService* Publish an event to interested subscribers*/public <T extends Event> void publishEvent(T event) {- // Only publish if service is started- if (!started) {+ // Only publish if service is started and MessageBrokerService is started (route needs to be started)+ if (!started || !messageBrokerService.isStarted()) {return;}