Repository: karaf-cellar Updated Branches: refs/heads/master 9152a5e0a -> 01422f1be
Manage restart of Cellar bundles cleanly Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/01422f1b Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/01422f1b Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/01422f1b Branch: refs/heads/master Commit: 01422f1beacb72ccfb80336b799d21e3518c1d21 Parents: 9152a5e Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Sep 11 11:11:38 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Sep 11 11:11:38 2015 +0200 ---------------------------------------------------------------------- .../apache/karaf/cellar/bundle/internal/osgi/Activator.java | 2 ++ .../org/apache/karaf/cellar/cloud/internal/osgi/Activator.java | 6 ++++++ .../apache/karaf/cellar/config/internal/osgi/Activator.java | 2 ++ .../org/apache/karaf/cellar/core/internal/osgi/Activator.java | 2 ++ .../org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java | 2 ++ .../org/apache/karaf/cellar/event/internal/osgi/Activator.java | 2 ++ .../apache/karaf/cellar/features/internal/osgi/Activator.java | 2 ++ .../apache/karaf/cellar/hazelcast/internal/osgi/Activator.java | 2 ++ .../karaf/cellar/kubernetes/internal/osgi/Activator.java | 5 +++++ .../org/apache/karaf/cellar/obr/internal/osgi/Activator.java | 2 ++ .../karaf/cellar/utils/ping/internal/osgi/Activator.java | 5 +++++ .../karaf/cellar/webconsole/internal/osgi/Activator.java | 2 ++ 12 files changed, 34 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/bundle/src/main/java/org/apache/karaf/cellar/bundle/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/internal/osgi/Activator.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/internal/osgi/Activator.java index 8a395f9..c0d681d 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/internal/osgi/Activator.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/internal/osgi/Activator.java @@ -123,6 +123,8 @@ public class Activator extends BaseActivator { @Override public void doStop() { + super.doStop(); + if (mbeanRegistration != null) { mbeanRegistration.unregister(); mbeanRegistration = null; http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/cloud/src/main/java/org/apache/karaf/cellar/cloud/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/cloud/src/main/java/org/apache/karaf/cellar/cloud/internal/osgi/Activator.java b/cloud/src/main/java/org/apache/karaf/cellar/cloud/internal/osgi/Activator.java index 38b6a7d..cbe0f56 100644 --- a/cloud/src/main/java/org/apache/karaf/cellar/cloud/internal/osgi/Activator.java +++ b/cloud/src/main/java/org/apache/karaf/cellar/cloud/internal/osgi/Activator.java @@ -36,6 +36,7 @@ public class Activator extends BaseActivator { private final static Logger LOGGER = LoggerFactory.getLogger(Activator.class); + @Override public void doStart() throws Exception { LOGGER.debug("CELLAR CLOUD: init discovery service factory"); Hashtable<String, Object> properties = new Hashtable<String, Object>(); @@ -44,4 +45,9 @@ public class Activator extends BaseActivator { register(ManagedServiceFactory.class, blobStoreDiscoveryServiceFactory, properties); } + @Override + public void doStop() { + super.doStop(); + } + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/config/src/main/java/org/apache/karaf/cellar/config/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/config/src/main/java/org/apache/karaf/cellar/config/internal/osgi/Activator.java b/config/src/main/java/org/apache/karaf/cellar/config/internal/osgi/Activator.java index 586ba5a..0502943 100644 --- a/config/src/main/java/org/apache/karaf/cellar/config/internal/osgi/Activator.java +++ b/config/src/main/java/org/apache/karaf/cellar/config/internal/osgi/Activator.java @@ -122,6 +122,8 @@ public class Activator extends BaseActivator implements ManagedService { @Override public void doStop() { + super.doStop(); + if (cellarConfigMBeanRegistration != null) { cellarConfigMBeanRegistration.unregister(); cellarConfigMBeanRegistration = null; http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java b/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java index c356d50..27141ba 100644 --- a/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java +++ b/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java @@ -67,6 +67,8 @@ public class Activator extends BaseActivator { @Override public void doStop() { + super.doStop(); + if (eventHandlerServiceTracker != null) { eventHandlerServiceTracker.close(); eventHandlerServiceTracker = null; http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java index 3033bc3..dd23737 100644 --- a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java +++ b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java @@ -108,6 +108,8 @@ public class Activator extends BaseActivator { @Override public void doStop() { + super.doStop(); + if (mbeanRegistration != null) { mbeanRegistration.unregister(); mbeanRegistration = null; http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/event/src/main/java/org/apache/karaf/cellar/event/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/event/src/main/java/org/apache/karaf/cellar/event/internal/osgi/Activator.java b/event/src/main/java/org/apache/karaf/cellar/event/internal/osgi/Activator.java index dc8dce4..61445d0 100644 --- a/event/src/main/java/org/apache/karaf/cellar/event/internal/osgi/Activator.java +++ b/event/src/main/java/org/apache/karaf/cellar/event/internal/osgi/Activator.java @@ -94,6 +94,8 @@ public class Activator extends BaseActivator { @Override public void doStop() { + super.doStop(); + if (localEventListener != null) { localEventListener.destroy(); localEventListener = null; http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/features/src/main/java/org/apache/karaf/cellar/features/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/features/src/main/java/org/apache/karaf/cellar/features/internal/osgi/Activator.java b/features/src/main/java/org/apache/karaf/cellar/features/internal/osgi/Activator.java index 5608380..aea83e9 100644 --- a/features/src/main/java/org/apache/karaf/cellar/features/internal/osgi/Activator.java +++ b/features/src/main/java/org/apache/karaf/cellar/features/internal/osgi/Activator.java @@ -135,6 +135,8 @@ public class Activator extends BaseActivator { @Override public void doStop() { + super.doStop(); + if (mbeanRegistration != null) { mbeanRegistration.unregister(); mbeanRegistration = null; http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/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 e809db6..7dae927 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 @@ -317,6 +317,8 @@ public class Activator extends BaseActivator implements ManagedService { @Override public void doStop() { + super.doStop(); + if (groupMBeanRegistration != null) { groupMBeanRegistration.unregister(); groupMBeanRegistration = null; http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/internal/osgi/Activator.java b/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/internal/osgi/Activator.java index 7e5639c..1317a0b 100644 --- a/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/internal/osgi/Activator.java +++ b/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/internal/osgi/Activator.java @@ -42,4 +42,9 @@ public class Activator extends BaseActivator { register(ManagedServiceFactory.class, factory, props); } + @Override + public void doStop() { + super.doStop(); + } + } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/obr/src/main/java/org/apache/karaf/cellar/obr/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/obr/src/main/java/org/apache/karaf/cellar/obr/internal/osgi/Activator.java b/obr/src/main/java/org/apache/karaf/cellar/obr/internal/osgi/Activator.java index 86e2ef3..72cca42 100644 --- a/obr/src/main/java/org/apache/karaf/cellar/obr/internal/osgi/Activator.java +++ b/obr/src/main/java/org/apache/karaf/cellar/obr/internal/osgi/Activator.java @@ -119,6 +119,8 @@ public class Activator extends BaseActivator { @Override public void doStop() { + super.doStop(); + if (mbeanRegistration != null) { mbeanRegistration.unregister(); mbeanRegistration = null; http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/utils/src/main/java/org/apache/karaf/cellar/utils/ping/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/karaf/cellar/utils/ping/internal/osgi/Activator.java b/utils/src/main/java/org/apache/karaf/cellar/utils/ping/internal/osgi/Activator.java index 6575996..c700022 100644 --- a/utils/src/main/java/org/apache/karaf/cellar/utils/ping/internal/osgi/Activator.java +++ b/utils/src/main/java/org/apache/karaf/cellar/utils/ping/internal/osgi/Activator.java @@ -60,4 +60,9 @@ public class Activator extends BaseActivator { register(EventHandler.class, pongHandler); } + @Override + public void doStop() { + super.doStop(); + } + } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01422f1b/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/internal/osgi/Activator.java b/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/internal/osgi/Activator.java index 1839430..fd49155 100644 --- a/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/internal/osgi/Activator.java +++ b/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/internal/osgi/Activator.java @@ -65,6 +65,8 @@ public class Activator extends BaseActivator { @Override public void doStop() { + super.doStop(); + if (plugin != null) { plugin.stop(); plugin = null;
