cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1563843 - in /cxf/branches/2.7.x-fixes/rt: databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/
Date Mon, 03 Feb 2014 11:41:56 GMT
Author: ay
Date: Mon Feb  3 11:41:55 2014
New Revision: 1563843

URL: http://svn.apache.org/r1563843
Log:
Merged revisions 1563835 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1563835 | ay | 2014-02-03 12:16:33 +0100 (Mon, 03 Feb 2014) | 2 lines

  [CXF-5517] Incorrect check for VOID type

........

Modified:
    cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
    cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java

Modified: cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=1563843&r1=1563842&r2=1563843&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Mon Feb  3 11:41:55 2014
@@ -443,7 +443,7 @@ class JAXBContextInitializer extends Ser
         }
 
         // must not have parameters and return type must not be void
-        if (method.getReturnType() == Void.class 
+        if (method.getReturnType() == Void.class || method.getReturnType() == Void.TYPE
             || method.getParameterTypes().length != 0
             || (method.getDeclaringClass().equals(Throwable.class)
             && !("getMessage".equals(method.getName())))

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java?rev=1563843&r1=1563842&r2=1563843&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
Mon Feb  3 11:41:55 2014
@@ -356,7 +356,7 @@ public class ClientProxyImpl extends Abs
                 accepts = InjectionUtils.isPrimitive(responseClass)
                     ? Collections.singletonList(MediaType.TEXT_PLAIN_TYPE)
                     : Collections.singletonList(MediaType.APPLICATION_XML_TYPE);        
-            } else if (responseClass == Void.class) {
+            } else if (responseClass == Void.class || responseClass == Void.TYPE) {
                 accepts = Collections.singletonList(MediaType.WILDCARD_TYPE);
             } else {
                 accepts = ori.getProduceTypes();
@@ -689,7 +689,7 @@ public class ClientProxyImpl extends Abs
             
             Method method = outMessage.getExchange().get(Method.class);
             checkResponse(method, r, outMessage);
-            if (method.getReturnType() == Void.class) { 
+            if (method.getReturnType() == Void.class || method.getReturnType() == Void.TYPE)
{
                 return null;
             }
             if (method.getReturnType() == Response.class

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1563843&r1=1563842&r2=1563843&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Mon Feb  3 11:41:55 2014
@@ -288,7 +288,7 @@ public class JaxWsServiceConfiguration e
             }
         }
         if (!isIn && isOutParam(method, paraNumber)) {
-            if (!method.getReturnType().equals(Void.class)) {
+            if (!method.getReturnType().equals(Void.class) && !method.getReturnType().equals(Void.TYPE))
{
                 ret++;
             }
             for (int i = 0; i < paraNumber; i++) {



Mime
View raw message