Author: dkulp
Date: Mon Mar 30 14:44:51 2009
New Revision: 759993
URL: http://svn.apache.org/viewvc?rev=759993&view=rev
Log:
Merged revisions 759961 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r759961 | dkulp | 2009-03-30 09:33:16 -0400 (Mon, 30 Mar 2009) | 2 lines
Fix problem of generating Response<void> (not valid) for async method when a
void response is expected
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 30 14:44:51 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759961
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java?rev=759993&r1=759992&r2=759993&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
Mon Mar 30 14:44:51 2009
@@ -332,7 +332,11 @@
StringBuffer sb = new StringBuffer();
sb.append(clzName);
sb.append("<");
- sb.append(response);
+ if ("void".equals(response)) {
+ sb.append('?');
+ } else {
+ sb.append(response);
+ }
sb.append(">");
return sb.toString();
}