svn commit: r1540845 - /felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdActivator.java

[jawi]

Author: jawi
Date: Mon Nov 11 21:04:13 2013
New Revision: 1540845

URL: http://svn.apache.org/r1540845
Log:
FELIX-3103 - let CometdActivator inherit from AbstractActivator:

- applied patch by Julian Sedding.


Modified:
    
felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdActivator.java

Modified: 
felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdActivator.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdActivator.java?rev=1540845&r1=1540844&r2=1540845&view=diff
==============================================================================
--- 
felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdActivator.java
 (original)
+++ 
felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdActivator.java
 Mon Nov 11 21:04:13 2013
@@ -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;
     }
 }