butek 2002/10/04 08:02:22
Modified: java/src/org/apache/axis/providers/java Tag:
explicitHeaderWork RPCProvider.java
Log:
Removed a spurious System.out.println that wouldn't let all-tests pass.
While I was in there I noticed some bad indentation, so I fixed that as well.
Revision Changes Path
No revision
No revision
1.96.6.2 +40 -42
xml-axis/java/src/org/apache/axis/providers/java/RPCProvider.java
Index: RPCProvider.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/providers/java/RPCProvider.java,v
retrieving revision 1.96.6.1
retrieving revision 1.96.6.2
diff -u -r1.96.6.1 -r1.96.6.2
--- RPCProvider.java 2 Oct 2002 20:39:07 -0000 1.96.6.1
+++ RPCProvider.java 4 Oct 2002 15:02:22 -0000 1.96.6.2
@@ -322,57 +322,55 @@
resBody.setEncodingStyle(msgContext.getEncodingStyle());
try {
- // Return first
- if ( operation.getMethod().getReturnType() != Void.TYPE ) {
- QName returnQName = operation.getReturnQName();
- if (returnQName == null) {
- returnQName = new QName("", methodName + "Return");
- }
-
- // For SOAP 1.2, add a result
- if (msgContext.getSOAPConstants() == SOAPConstants.SOAP12_CONSTANTS)
- {
- RPCParam result = new RPCParam
- (Constants.QNAME_RPC_RESULT, returnQName.getLocalPart());
- if (!operation.isReturnHeader()) {
- resBody.addParam(result);
- } else {
- resEnv.addHeader(new RPCHeaderParam(result));
+ // Return first
+ if ( operation.getMethod().getReturnType() != Void.TYPE ) {
+ QName returnQName = operation.getReturnQName();
+ if (returnQName == null) {
+ returnQName = new QName("", methodName + "Return");
}
- }
+ // For SOAP 1.2, add a result
+ if (msgContext.getSOAPConstants() ==
+ SOAPConstants.SOAP12_CONSTANTS)
+ {
+ RPCParam result = new RPCParam
+ (Constants.QNAME_RPC_RESULT, returnQName.getLocalPart());
+ if (!operation.isReturnHeader()) {
+ resBody.addParam(result);
+ } else {
+ resEnv.addHeader(new RPCHeaderParam(result));
+ }
- RPCParam param = new RPCParam(returnQName, objRes);
- param.setParamDesc(operation.getReturnParamDesc());
- if (!operation.isReturnHeader()) {
- resBody.addParam(param);
- } else {
- resEnv.addHeader(new RPCHeaderParam(param));
- }
-
- }
+ }
- // Then any other out params
- if (!outs.isEmpty()) {
- for (Iterator i = outs.iterator(); i.hasNext();) {
- // We know this has a holder, so just unwrap the value
- RPCParam param = (RPCParam) i.next();
- Holder holder = (Holder)param.getValue();
- Object value = JavaUtils.getHolderValue(holder);
- ParameterDesc paramDesc = param.getParamDesc();
-
- param.setValue(value);
- if (paramDesc != null &&
- paramDesc.isOutHeader()) {
- resEnv.addHeader(new RPCHeaderParam(param));
- } else {
+ RPCParam param = new RPCParam(returnQName, objRes);
+ param.setParamDesc(operation.getReturnParamDesc());
+ if (!operation.isReturnHeader()) {
resBody.addParam(param);
+ } else {
+ resEnv.addHeader(new RPCHeaderParam(param));
}
+
}
- }
+ // Then any other out params
+ if (!outs.isEmpty()) {
+ for (Iterator i = outs.iterator(); i.hasNext();) {
+ // We know this has a holder, so just unwrap the value
+ RPCParam param = (RPCParam) i.next();
+ Holder holder = (Holder)param.getValue();
+ Object value = JavaUtils.getHolderValue(holder);
+ ParameterDesc paramDesc = param.getParamDesc();
+
+ param.setValue(value);
+ if (paramDesc != null && paramDesc.isOutHeader()) {
+ resEnv.addHeader(new RPCHeaderParam(param));
+ } else {
+ resBody.addParam(param);
+ }
+ }
+ }
} catch (Exception e) {
- System.out.println(e);
throw e;
}
