commit f98319d2705cd5e7710e650a40130dd096a08938
author Carlos Sierra Andrés <carlos.sierra@liferay.com> Fri Nov 22 19:48:53 2019 +0100
committer Carlos Sierra Andrés <carlos.sierra@liferay.com> Fri Nov 22 19:48:53 2019 +0100
tree 742e24a18c0138c2a9837ff41fa14f0886fe42e0
parent 22a5cf632ead51cbe6b112a06b8dcce6c2c453b3

Do not override default HTTP Whiteboard context

jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java

diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
index f4cc52c..f97e28f 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
@@ -1328,9 +1328,12 @@
                 return contextProperties;
             };
 
-            program = OSGi.register(
-                ServletContextHelper.class,
-                () -> new ServletContextHelper() {}, contextPropertiesSup);
+            if (!"".equals(address)) {
+                program = OSGi.register(
+                    ServletContextHelper.class,
+                    () -> new ServletContextHelper() {},
+                    contextPropertiesSup);
+            }
         }
         else {
             contextPropertiesSup = () -> {