diff options
Diffstat (limited to 'branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider')
5 files changed, 12 insertions, 18 deletions
diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java index e229cc9043..c2a9a61257 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java @@ -116,7 +116,7 @@ public abstract class AbstractMessageProcessor implements JMSMessageProcessor { } } - protected abstract Object[] extractPayload(Message msg); + protected abstract Object extractPayload(Message msg); protected abstract Message createJMSMessage(Session session, Object o); 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) { diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java index e9ae3cecaa..4e07e4eab8 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java @@ -40,15 +40,10 @@ public class ObjectMessageProcessor extends AbstractMessageProcessor { } @Override - protected Object[] extractPayload(Message msg) { + protected Object extractPayload(Message msg) { try { - Object o = ((ObjectMessage)msg).getObject(); - if (o != null && o.getClass().isArray()) { - return (Object[])o; - } else { - return new Object[] { o}; - } + return ((ObjectMessage)msg).getObject(); } catch (JMSException e) { throw new JMSBindingException(e); diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java index d8490c6223..cf22e400b1 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java @@ -38,14 +38,14 @@ public class TextMessageProcessor extends AbstractMessageProcessor { } @Override - protected Object[] extractPayload(Message msg) { + protected Object extractPayload(Message msg) { try { if (!(msg instanceof TextMessage)) { throw new IllegalStateException("expecting JMS TextMessage: " + msg); } - return new Object[] {((TextMessage)msg).getText()}; + return ((TextMessage)msg).getText(); } catch (JMSException e) { throw new JMSBindingException(e); diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java index 88dd41cc57..3a4ba7b809 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java @@ -45,17 +45,17 @@ public class XMLTextMessageProcessor extends AbstractMessageProcessor { } @Override - protected Object[] extractPayload(Message msg) { + protected Object extractPayload(Message msg) { try { String xml = ((TextMessage)msg).getText(); - Object[] os; + Object os; if (xml != null) { XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml)); StAXOMBuilder builder = new StAXOMBuilder(reader); - os = new Object[] {builder.getDocumentElement()}; + os = builder.getDocumentElement(); } else { - os = new Object[] {}; + os = null; } return os; |