FELIX-3103 - let CometdActivator inherit from AbstractActivator:
- applied patch by Julian Sedding.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1540845 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdActivator.java b/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdActivator.java
index a9ff00e..a2b9fa8 100644
--- a/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdActivator.java
+++ b/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdActivator.java
@@ -16,25 +16,21 @@
*/
package org.apache.felix.http.cometd.internal;
-import org.apache.felix.http.base.internal.AbstractHttpActivator;
+import org.apache.felix.http.base.internal.AbstractActivator;
-public final class CometdActivator
- extends AbstractHttpActivator
+public final class CometdActivator extends AbstractActivator
{
- private CometdServiceImpl cometd;
+ private volatile CometdServiceImpl cometd;
- protected void doStart()
- throws Exception
+ protected void doStart() throws Exception
{
- super.doStart();
this.cometd = new CometdServiceImpl(getBundleContext());
this.cometd.start();
}
- protected void doStop()
- throws Exception
+ protected void doStop() throws Exception
{
this.cometd.stop();
- super.doStop();
+ this.cometd = null;
}
}