cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Fixing the system WADL test
Date Wed, 13 Apr 2016 15:11:41 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 2f8a1f764 -> 8215aeb4a


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/8215aeb4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8215aeb4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8215aeb4

Branch: refs/heads/master
Commit: 8215aeb4a3a0bb4d0755642e4ffe67117a61ec29
Parents: 2f8a1f7
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Wed Apr 13 16:11:26 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Wed Apr 13 16:11:26 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/8215aeb4/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/8215aeb4/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);


Mime
View raw message