1 files changed, 6 insertions, 1 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 d65522e541..e2fc49834e 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
@@ -93,7 +93,12 @@ public abstract class AbstractMessageProcessor implements JMSMessageProcessor {
     public Object extractPayloadFromJMSMessage(Message msg) {
         try {
             if (msg.getBooleanProperty(JMSBindingConstants.FAULT_PROPERTY)) {
-                throw new ServiceRuntimeException("remote service exception, see nested exception", (Throwable)((ObjectMessage)msg).getObject());
+                Object exc = ((ObjectMessage)msg).getObject();
+                if (exc instanceof RuntimeException) {
+                    throw new ServiceRuntimeException("remote service exception, see nested exception", (Throwable)exc);
+                } else {
+                    return new InvocationTargetException((Throwable) exc);
+                }
             }
         } catch (JMSException e) {
             throw new JMSBindingException(e);