Do not release OSGi HttpService

Fix openhab/openhab-core#4140

Signed-off-by: Laurent Garnier <[email protected]>

Author: lolodomo

bundles/org.jupnp/src/main/java/org/jupnp/OSGiUpnpServiceConfiguration.java

@@ -87,6 +87,7 @@
  * @author Kai Kreuzer - introduced bounded thread pool and http service streaming server
  * @author Victor Toni - consolidated transport abstraction into one interface
  * @author Wouter Born - conditionally enable component based on autoEnable configuration value
+ * @author Laurent Garnier - do not release the OSGi HttpService
  */
 @Component(configurationPid = "org.jupnp", configurationPolicy = ConfigurationPolicy.REQUIRE, enabled = false)
 public class OSGiUpnpServiceConfiguration implements UpnpServiceConfiguration {
@@ -122,9 +123,6 @@ public class OSGiUpnpServiceConfiguration implements UpnpServiceConfiguration {
 
     protected BundleContext context;
 
-    @SuppressWarnings("rawtypes")
-    protected ServiceReference httpServiceReference;
-
     @SuppressWarnings("rawtypes")
     protected TransportConfiguration transportConfiguration;
 
@@ -180,18 +178,13 @@ protected void activate(BundleContext context, Map<String, Object> configProps)
 
         namespace = createNamespace();
 
-        logger.debug("{} activated", this);
+        logger.debug("OSGiUpnpServiceConfiguration {} activated", this);
     }
 
     @Deactivate
     protected void deactivate() {
-        if (httpServiceReference != null) {
-            context.ungetService(httpServiceReference);
-        }
-
         shutdown();
-
-        logger.debug("{} deactivated", this);
+        logger.debug("OSGiUpnpServiceConfiguration {} deactivated", this);
     }
 
     @Override
@@ -240,22 +233,18 @@ public StreamServer createStreamServer(NetworkAddressFactory networkAddressFacto
         ServiceReference serviceReference = context.getServiceReference(HttpService.class.getName());
 
         if (serviceReference != null) {
-
-            if (httpServiceReference != null) {
-                context.ungetService(httpServiceReference);
-            }
-
-            httpServiceReference = serviceReference;
-
             HttpService httpService = (HttpService) context.getService(serviceReference);
 
             if (httpService != null) {
+                logger.debug("createStreamServer using OSGi HttpService (port {})",
+                        httpProxyPort != -1 ? httpProxyPort : callbackURI.getBasePath().getPort());
                 return new ServletStreamServerImpl(new ServletStreamServerConfigurationImpl(
                         HttpServiceServletContainerAdapter.getInstance(httpService, context),
                         httpProxyPort != -1 ? httpProxyPort : callbackURI.getBasePath().getPort()));
             }
         }
 
+        logger.debug("createStreamServer (port {})", networkAddressFactory.getStreamListenPort());
         return transportConfiguration.createStreamServer(networkAddressFactory.getStreamListenPort());
     }
 

bundles/org.jupnp/src/main/java/org/jupnp/UpnpServiceImpl.java

@@ -52,7 +52,7 @@
  * <p>
  * Override the various <tt>create...()</tt> methods to customize instantiation of protocol factory, router, etc.
  * </p>
- * 
+ *
  * @author Christian Bauer
  * @author Kai Kreuzer - OSGiified the service
  */
@@ -85,6 +85,8 @@ public class UpnpServiceImpl implements UpnpService {
 
     protected volatile ScheduledFuture<?> scheduledFuture;
 
+    private boolean OSGiHttpServiceInjected;
+
     public UpnpServiceImpl() {
     }
 
@@ -124,6 +126,7 @@ private static ScheduledExecutorService createExecutor() {
     public void setUpnpServiceConfiguration(UpnpServiceConfiguration configuration) {
         this.configuration = configuration;
         if (isRunning) {
+            logger.debug("New OSGi UpnpServiceConfiguration is bound while UPnP service is running; restart needed");
             restart(true);
         }
     }
@@ -134,16 +137,20 @@ public void unsetUpnpServiceConfiguration(UpnpServiceConfiguration configuration
 
     @Reference
     public void setHttpService(HttpService httpService) {
+        OSGiHttpServiceInjected = true;
         // Only need to restart jupnp after/if HttpService appears
         if (isRunning) {
+            logger.debug("New OSGi HttpService is bound while UPnP service is running; restart needed");
             shutdown(false);
             delayedStartup(1500);
         }
     }
 
     public void unsetHttpService(HttpService httpService) {
+        OSGiHttpServiceInjected = false;
         // Only need to restart jupnp after/if HttpService disappears
         if (isRunning) {
+            logger.debug("OSGi HttpService is unbound while UPnP service is running; restart needed");
             shutdown(false);
             delayedStartup(1500);
         }
@@ -270,6 +277,7 @@ public void startup() {
                 // Instantiation order is important: Router needs to start its network services after registry is ready
 
                 logger.debug("Using configuration: {}", getConfiguration().getClass().getName());
+                logger.debug("{} OSGi HttpService", OSGiHttpServiceInjected ? "Using" : "Not using");
 
                 this.protocolFactory = createProtocolFactory();
                 this.registry = createRegistry(protocolFactory);