Repository: karaf-cellar Updated Branches: refs/heads/master 1e659618e -> d28cfc29d
Fix HazelcastGroupManager init Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/d28cfc29 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/d28cfc29 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/d28cfc29 Branch: refs/heads/master Commit: d28cfc29df67fe01e11a8721de19b477b35c1708 Parents: 1e65961 Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Aug 26 22:17:35 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Aug 26 22:17:35 2015 +0200 ---------------------------------------------------------------------- .../karaf/cellar/hazelcast/internal/osgi/Activator.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/d28cfc29/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java index c0f2dfe..6caa941 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java @@ -79,6 +79,7 @@ public class Activator extends BaseActivator implements ManagedService { private List<DiscoveryService> discoveryServices = new ArrayList<DiscoveryService>(); private List<Synchronizer> synchronizers = new ArrayList<Synchronizer>(); private HazelcastInstance hazelcastInstance; + private HazelcastGroupManager groupManager; private DiscoveryTask discoveryTask; private CellarExtender extender; private TopicProducer producer; @@ -184,12 +185,13 @@ public class Activator extends BaseActivator implements ManagedService { eventTransportFactory.setDispatcher(dispatcher); LOGGER.debug("[CELLAR HAZELCAST] Create and register Hazelcast group manager"); - HazelcastGroupManager groupManager = new HazelcastGroupManager(); + groupManager = new HazelcastGroupManager(); groupManager.setInstance(hazelcastInstance); groupManager.setCombinedClassLoader(combinedClassLoader); groupManager.setBundleContext(bundleContext); groupManager.setConfigurationAdmin(configurationAdmin); groupManager.setEventTransportFactory(eventTransportFactory); + groupManager.init(); register(new Class[]{GroupManager.class, ConfigurationListener.class}, groupManager); LOGGER.debug("[CELLAR HAZELCAST] Create Cellar membership listener"); @@ -350,6 +352,10 @@ public class Activator extends BaseActivator implements ManagedService { synchronizerServiceTracker.close(); synchronizerServiceTracker = null; } + if (groupManager != null) { + groupManager.destroy(); + groupManager = null; + } if (discoveryServiceTracker != null) { discoveryServiceTracker.close(); discoveryServiceTracker = null;
