This is an automated email from the ASF dual-hosted git repository.

sergeyb pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
     new becbb2f  [CXF-7630] Do not preset namebindings when installing through 
a Feature
becbb2f is described below

commit becbb2f438a861c7bfd90a9dd062030a7a1bb37b
Author: Carlos Sierra <carlos.sie...@liferay.com>
AuthorDate: Fri Feb 2 09:46:36 2018 +0100

    [CXF-7630] Do not preset namebindings when installing through a Feature
---
 .../src/main/java/org/apache/cxf/jaxrs/model/FilterProviderInfo.java    | 2 +-
 .../main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/FilterProviderInfo.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/FilterProviderInfo.java
index f924fbc..8294736 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/FilterProviderInfo.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/FilterProviderInfo.java
@@ -49,7 +49,7 @@ public class FilterProviderInfo<T> extends ProviderInfo<T> {
                               boolean dynamic,
                               Map<Class<?>, Integer> supportedContracts) {
         super(resourceClass, serviceClass, provider, bus, true);
-        this.nameBinding = Collections.singleton(nameBinding);
+        this.nameBinding = nameBinding == null ? null : 
Collections.singleton(nameBinding);
         this.supportedContracts = supportedContracts;
         this.dynamic = dynamic;
     }
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
index b850d0b..3ae0728 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
@@ -219,6 +219,8 @@ public final class ServerProviderFactory extends 
ProviderFactory {
                                                                         
providerCls,
                                                                         
featureProvider,
                                                                         
getBus(),
+                                                                        null,
+                                                                        false,
                                                                         
contracts));
                     } else {
                         allProviders.add(featureProvider);

-- 
To stop receiving notification emails like this one, please contact
serg...@apache.org.

Reply via email to