TUSCANY-2799 - don't return responses inside arrays. Generally reorg the code so that the message processors only worry about getting data in and out of JMS message while the interceptors worry about whether the data should be wrapped as an array. In this way the forward path can do array wrapping in order to keep databinding happy while the response path can omit array wrapping

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

1 files changed, 3 insertions, 4 deletions

diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
index 44b2e3b990..047743654f 100644
--- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
+++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
@@ -39,7 +39,7 @@ public class BytesMessageProcessor extends AbstractMessageProcessor {
     }
 
     @Override
-    protected Object[] extractPayload(Message msg) {
+    protected Object extractPayload(Message msg) {
         try {
 
             if (!(msg instanceof BytesMessage)) {
@@ -49,7 +49,7 @@ public class BytesMessageProcessor extends AbstractMessageProcessor {
             long noOfBytes = ((BytesMessage)msg).getBodyLength();
             byte [] bytes = new byte[(int)noOfBytes];
             ((BytesMessage)msg).readBytes(bytes);
-            return new Object[] {bytes};
+            return bytes;
 
         } catch (JMSException e) {
             throw new JMSBindingException(e);
@@ -63,8 +63,7 @@ public class BytesMessageProcessor extends AbstractMessageProcessor {
             // TODO - an experiment. How to enforce a single
             //        byte array parameter
             BytesMessage message = session.createBytesMessage();
-            byte [] bytes = (byte[])((Object[])o)[0];
-            message.writeBytes(bytes); 
+            message.writeBytes((byte[])o); 
             return message;
 
         } catch (JMSException e) {