Repository: aries-jax-rs-whiteboard
Updated Branches:
  refs/heads/master 270d10265 -> f01784824


Filter out '.' properties


Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/f0178482
Tree: 
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f0178482
Diff: 
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f0178482

Branch: refs/heads/master
Commit: f01784824569fd8eb859868bbb3a9c8a51b893cf
Parents: 270d102
Author: Carlos Sierra <csie...@apache.org>
Authored: Thu May 17 17:31:13 2018 +0200
Committer: Carlos Sierra <csie...@apache.org>
Committed: Thu May 17 17:31:13 2018 +0200

----------------------------------------------------------------------
 .../apache/aries/jax/rs/whiteboard/internal/Whiteboard.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f0178482/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 480c850..20bb2f5 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
@@ -78,6 +78,7 @@ import static 
org.apache.aries.jax.rs.whiteboard.internal.utils.Utils.canonicali
 import static 
org.apache.aries.jax.rs.whiteboard.internal.utils.Utils.generateApplicationName;
 import static 
org.apache.aries.jax.rs.whiteboard.internal.utils.Utils.getProperties;
 import static 
org.apache.aries.jax.rs.whiteboard.internal.utils.Utils.highestPer;
+import static 
org.apache.aries.jax.rs.whiteboard.internal.utils.Utils.mergePropertyMaps;
 import static 
org.apache.aries.jax.rs.whiteboard.internal.utils.Utils.onlyGettables;
 import static org.apache.aries.jax.rs.whiteboard.internal.utils.Utils.service;
 import static 
org.apache.aries.jax.rs.whiteboard.internal.utils.Utils.updateProperty;
@@ -724,8 +725,10 @@ public class Whiteboard {
                     defaultApplicationBase = "/";
                 }
 
-                Map<String, Object> properties = new HashMap<>(
-                    _configurationMap);
+                Map<String, Object> properties = new HashMap<>();
+
+                mergePropertyMaps(properties, _configurationMap);
+
                 properties.put(JAX_RS_NAME, DEFAULT_NAME);
                 properties.put(JAX_RS_APPLICATION_BASE, 
defaultApplicationBase);
                 properties.put("service.ranking", Integer.MIN_VALUE);
@@ -1226,7 +1229,7 @@ public class Whiteboard {
             Utils.mergePropertyMaps(servletProperties, serviceProperties);
 
             Utils.mergePropertyMaps(servletProperties, _configurationMap);
-            
+
             servletProperties.putIfAbsent(
                 HTTP_WHITEBOARD_TARGET, "(osgi.http.endpoint=*)");
 

Reply via email to