FELIX-4937 : IllegalArgumentException on shutdown if sessions have been created
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1687543 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java b/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java
index 61955e5..2bd647d 100644
--- a/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java
+++ b/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java
@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServlet;
import org.apache.felix.http.base.internal.AbstractHttpActivator;
+import org.apache.felix.http.base.internal.EventDispatcher;
import org.apache.felix.http.base.internal.logger.SystemLogger;
import org.osgi.framework.Constants;
import org.osgi.service.http.runtime.HttpServiceRuntimeConstants;
@@ -48,11 +49,13 @@
getBundleContext().registerService(HttpServlet.class.getName(), getDispatcherServlet(), props);
// Http Session event dispatcher
+ final EventDispatcher dispatcher = getEventDispatcher();
+ dispatcher.setActive(true);
props = new Hashtable<String, Object>();
- props.put("http.felix.dispatcher", getEventDispatcher().getClass().getName());
+ props.put("http.felix.dispatcher", dispatcher.getClass().getName());
props.put(Constants.SERVICE_DESCRIPTION, "Dispatcher for bridged HttpSession events");
props.put(Constants.SERVICE_VENDOR, VENDOR);
- getBundleContext().registerService(EventListener.class.getName(), getEventDispatcher(), props);
+ getBundleContext().registerService(EventListener.class.getName(), dispatcher, props);
// check for endpoint registration property
if ( getBundleContext().getProperty(FELIX_HTTP_SERVICE_ENDPOINTS) != null )