summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/modules/binding-jms-runtime/src
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-05-29 08:27:11 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-05-29 08:27:11 +0000
commit0ff5b1526032147746a2f43b9463e791e115b872 (patch)
treee9c037b4c686fba77fbbf018f115ecd7f326604c /branches/sca-java-1.x/modules/binding-jms-runtime/src
parent171b5220716b9403028c4c9edc054619cf1b9573 (diff)
TUSCANY-2967 back out the trial change to bytes format messages so that all wire formats consistently return faults as JMS Object messages.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@779892 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/binding-jms-runtime/src')
-rw-r--r--branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java12
1 files changed, 10 insertions, 2 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 6ffbabd2b0..5d1990eb90 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
@@ -45,13 +45,16 @@ public class BytesMessageProcessor extends AbstractMessageProcessor {
super(jmsBinding);
}
+/* TUSCANY-2967 - disable this change while we decide what to do and
+ * return faults as JMSObject messages to be consistent
+ * again with other wire formats
@Override
public Object extractPayloadFromJMSMessage(Message msg) {
byte [] bytes = (byte [])extractPayload(msg);
try {
if (msg.getBooleanProperty(JMSBindingConstants.FAULT_PROPERTY)) {
- return new InvocationTargetException(new ServiceRuntimeException(bytes.toString()));
+ return new InvocationTargetException(new ServiceRuntimeException(new String(bytes)));
} else {
return bytes;
}
@@ -59,6 +62,7 @@ public class BytesMessageProcessor extends AbstractMessageProcessor {
throw new JMSBindingException(e);
}
}
+*/
@Override
protected Object extractPayload(Message msg) {
@@ -79,6 +83,9 @@ public class BytesMessageProcessor extends AbstractMessageProcessor {
}
}
+/* TUSCANY-2967 - disable this change while we decide what to do and
+ * return faults as JMSObject messages to be consistent
+ * again with other wire formats
@Override
public Message createFaultMessage(Session session, Throwable o) {
try {
@@ -88,7 +95,8 @@ public class BytesMessageProcessor extends AbstractMessageProcessor {
} catch (JMSException e) {
throw new JMSBindingException(e);
}
- }
+ }
+*/
@Override
protected Message createJMSMessage(Session session, Object o) {