From ebc9f8e8938b56b0564ca447fef38ba42db689dd Mon Sep 17 00:00:00 2001 From: bdaniel Date: Sun, 14 Nov 2010 22:32:24 +0000 Subject: TUSCANY-3664 Add support for multiple operation output types git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035090 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src') diff --git a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java index a072b31322..dc1b7e024b 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java +++ b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java @@ -240,7 +240,7 @@ public class Interface2WSDLGenerator { if (useOutputWrapper) { addDataType(dataTypes, dt2, helpers); } else { - dt2 = op.getOutputType(); + dt2 = op.getOutputType().getLogical().get(0); addDataType(dataTypes, dt2, helpers); } @@ -645,8 +645,9 @@ public class Interface2WSDLGenerator { if (op.getWrapper() != null) { outputMsg.addPart(generateWrapperPart(definition, op, helpers, wrappers, false)); } else { - DataType outputType = op.getOutputType(); - if (outputType != null) { + + if ((op.getOutputType() != null) && ( op.getOutputType().getLogical().get(0) != null)) { + DataType outputType = op.getOutputType().getLogical().get(0); outputMsg.addPart(generatePart(definition, outputType, "return")); elements = new ArrayList(); ElementInfo element = getElementInfo(outputType.getPhysical(), outputType, null, helpers); @@ -754,7 +755,7 @@ public class Interface2WSDLGenerator { } else { Class returnType = method.getReturnType(); if (returnType != Void.TYPE) { - DataType dataType = operation.getOutputType(); + DataType dataType = operation.getOutputType().getLogical().get(0); elements.set(0, getElementInfo(returnType, dataType, elements.get(0).getQName(), helpers)); } } -- cgit v1.2.3