[cxf] branch master updated: [CXF-7629] Checking other standard providers too

[sergeyb]

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


The following commit(s) were added to refs/heads/master by this push:
     new 0ca11c9  [CXF-7629] Checking other standard providers too
0ca11c9 is described below

commit 0ca11c9bc17d652f3377e3eea995bbb256d063d1
Author: Sergey Beryozkin <sberyoz...@gmail.com>
AuthorDate: Fri Feb 2 14:00:56 2018 +0000

    [CXF-7629] Checking other standard providers too
---
 .../src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java  | 4 ++--
 .../java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index 10bf0b9..a5767a0 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -575,7 +575,7 @@ public abstract class ProviderFactory {
                 addProviderToList(messageWriters, provider);
             }
 
-            if (ContextResolver.class.isAssignableFrom(providerCls)) {
+            if (filterContractSupported(provider, providerCls, 
ContextResolver.class)) {
                 addProviderToList(contextResolvers, provider);
             }
 
@@ -591,7 +591,7 @@ public abstract class ProviderFactory {
                 writeInts.add((ProviderInfo<WriterInterceptor>)provider);
             }
 
-            if (ParamConverterProvider.class.isAssignableFrom(providerCls)) {
+            if (filterContractSupported(provider, providerCls, 
ParamConverterProvider.class)) {
                 
paramConverters.add((ProviderInfo<ParamConverterProvider>)provider);
             }
         }
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 3d4b082..bfdd8cc 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
@@ -259,8 +259,7 @@ public final class ServerProviderFactory extends 
ProviderFactory {
                 dynamicFeatures.add((DynamicFeature)feature);
             }
 
-
-            if (ExceptionMapper.class.isAssignableFrom(providerCls)) {
+            if (filterContractSupported(provider, providerCls, 
ExceptionMapper.class)) {    
                 addProviderToList(exceptionMappers, provider);
             }
 

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