aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csie...@apache.org
Subject [aries-jax-rs-whiteboard] 01/02: Do not override default HTTP Whiteboard context
Date Fri, 22 Nov 2019 19:00:08 GMT
This is an automated email from the ASF dual-hosted git repository.

csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git

commit f98319d2705cd5e7710e650a40130dd096a08938
Author: Carlos Sierra Andrés <carlos.sierra@liferay.com>
AuthorDate: Fri Nov 22 19:48:53 2019 +0100

    Do not override default HTTP Whiteboard context
---
 .../org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 @@ public class Whiteboard {
                 return contextProperties;
             };
 
-            program = OSGi.register(
-                ServletContextHelper.class,
-                () -> new ServletContextHelper() {}, contextPropertiesSup);
+            if (!"".equals(address)) {
+                program = OSGi.register(
+                    ServletContextHelper.class,
+                    () -> new ServletContextHelper() {},
+                    contextPropertiesSup);
+            }
         }
         else {
             contextPropertiesSup = () -> {


Mime
View raw message