You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2014/02/03 12:53:05 UTC
svn commit: r1563848 -
/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Author: ay
Date: Mon Feb 3 11:53:05 2014
New Revision: 1563848
URL: http://svn.apache.org/r1563848
Log:
Merged revisions 1563847 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1563847 | ay | 2014-02-03 12:51:11 +0100 (Mon, 03 Feb 2014) | 10 lines
Merged revisions 1563840 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1563840 | ay | 2014-02-03 12:28:14 +0100 (Mon, 03 Feb 2014) | 2 lines
a minor clean up for CXF-5517
........
........
Modified:
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1563848&r1=1563847&r2=1563848&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Mon Feb 3 11:53:05 2014
@@ -296,7 +296,7 @@ public class JaxWsServiceConfiguration e
}
}
if (!isIn && isOutParam(method, paraNumber)) {
- if (!method.getReturnType().equals(Void.class) && !method.getReturnType().equals(Void.TYPE)) {
+ if (method.getReturnType() != Void.class && method.getReturnType() != Void.TYPE) {
ret++;
}
for (int i = 0; i < paraNumber; i++) {