This is an automated email from the ASF dual-hosted git repository. sergeyb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 32c9bc523646b58d49cd81893464fe22219a5a40 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 0f04b5e..1c92de2 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 bf4ddf1..54eba42 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.