Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 3b2ce76de -> b6dca9325
Fixing the system WADL test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b6dca932 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b6dca932 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b6dca932 Branch: refs/heads/3.1.x-fixes Commit: b6dca932548fc130bef28610646699bfafd80798 Parents: 3b2ce76 Author: Sergey Beryozkin <[email protected]> Authored: Wed Apr 13 16:11:26 2016 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Apr 13 16:12:31 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/provider/ProviderFactory.java | 5 ++--- .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b6dca932/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java ---------------------------------------------------------------------- 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 f89c6fb..2754c61 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 @@ -1222,11 +1222,10 @@ public abstract class ProviderFactory { return theProviders; } - public MessageBodyWriter<?> getRegisteredJaxbWriter() { + public MessageBodyWriter<?> getDefaultJaxbWriter() { for (ProviderInfo<MessageBodyWriter<?>> pi : this.messageWriters) { Class<?> cls = pi.getProvider().getClass(); - if (cls.getName().equals(JAXB_PROVIDER_NAME) - || cls.getSuperclass().getName().equals(JAXB_PROVIDER_NAME)) { + if (cls.getName().equals(JAXB_PROVIDER_NAME)) { return pi.getProvider(); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/b6dca932/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java ---------------------------------------------------------------------- diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java index a110e3c..5f3aeb0 100644 --- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java +++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java @@ -286,7 +286,7 @@ public class WadlGenerator implements ContainerRequestFilter { MessageBodyWriter<?> jaxbWriter = (m != null && useJaxbContextForQnames) - ? ServerProviderFactory.getInstance(m).getRegisteredJaxbWriter() : null; + ? ServerProviderFactory.getInstance(m).getDefaultJaxbWriter() : null; ResourceTypes resourceTypes = ResourceUtils.getAllRequestResponseTypes(cris, useJaxbContextForQnames, jaxbWriter);
