TUSCANY-3664 Add support for multiple operation output types

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035089 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 11 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index 9eade3ba5c..69da9019a8 100644
--- a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
@@ -162,23 +162,24 @@ public class JavaImplementationInvoker implements Invoker {
             
                         
             if (argumentHolderCount > 0) {
-                // Holder pattern. Any payload Holder<T> types are returned as the message body.
-                List<Object> returnArgs = new ArrayList<Object>();
-                returnArgs.add(ret);
+            	
+                // Holder pattern. Any payload Holder<T> types are returned as part of the message body.
+            	Object[] payloadArray = (Object[])payload;           
+            	ArrayList<Object> result = new ArrayList<Object>();
                 if (imethod != null) {
-                	Object[] payloadArray = (Object[])payload;
-                    for (int i = 0, size = op.getParameterModes().size(); i < size; i++) {
-                        // System.out.println( "JavaImplementationInvoker.invoke return parameter " + i + " type=" + parameter.getClass().getName() );
+                	
+                	result.add(ret);
+                    for (int i = 0, size = op.getParameterModes().size(); i < size; i++) {                       
                         if (ParameterMode.IN != op.getParameterModes().get(i)) {                        	
-                            // Demote array params from Holder<T> to <T>.                                                   
-                                Holder<Object> item = (Holder<Object>)payloadArray[i];
-                                payloadArray[i] = item.value;
-                                returnArgs.add(payloadArray[i]);
+                        	// Demote array params from Holder<T> to <T>.                                                   
+                        	Holder<Object> item = (Holder<Object>)payloadArray[i];
+                        	payloadArray[i] = item.value;
+                        	result.add(payloadArray[i]);                        	                      
                         }
                     }
                 }
 
-                msg.setBody(returnArgs.toArray());
+                msg.setBody(result.toArray());
 
             } else {
                 msg.setBody(ret);