Author: ay
Date: Mon Feb 3 11:16:33 2014
New Revision: 1563835
URL: http://svn.apache.org/r1563835
Log:
[CXF-5517] Incorrect check for VOID type
Modified:
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
Modified:
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=1563835&r1=1563834&r2=1563835&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
(original)
+++
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Mon Feb 3 11:16:33 2014
@@ -444,7 +444,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/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1563835&r1=1563834&r2=1563835&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
(original)
+++
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Mon Feb 3 11:16:33 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++) {
Modified:
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java?rev=1563835&r1=1563834&r2=1563835&view=diff
==============================================================================
---
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
(original)
+++
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
Mon Feb 3 11:16:33 2014
@@ -358,7 +358,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();
@@ -692,7 +692,7 @@ public class ClientProxyImpl extends Abs
Method method = outMessage.getExchange().get(Method.class);
checkResponse(method, r, outMessage);
- if (method.getReturnType() == Void.class || method.getReturnType()
== void.class) {
+ if (method.getReturnType() == Void.class || method.getReturnType()
== Void.TYPE) {
return null;
}
if (method.getReturnType() == Response.class
