svn commit: r732415 - in /tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider: AbstractMessageProcessor.java RRBJMSBindingInvoker.java

[antelder]

Author: antelder
Date: Wed Jan  7 10:27:33 2009
New Revision: 732415

URL: http://svn.apache.org/viewvc?rev=732415&view=rev
Log:
Commit temporary work arounds for TUSCANY-2593

Modified:
    
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
    
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java

Modified: 
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java?rev=732415&r1=732414&r2=732415&view=diff
==============================================================================
--- 
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
 (original)
+++ 
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
 Wed Jan  7 10:27:33 2009
@@ -18,6 +18,8 @@
  */
 package org.apache.tuscany.sca.binding.jms.provider;
 
+import java.lang.reflect.InvocationTargetException;
+
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.ObjectMessage;
@@ -101,7 +103,11 @@
         try {
 
             ObjectMessage message = session.createObjectMessage();
-            message.setObject(o);
+            if (o instanceof ServiceRuntimeException && 
((ServiceRuntimeException)o).getCause() instanceof InvocationTargetException) {
+                message.setObject(o.getCause() );
+            } else {
+                message.setObject(o);
+            }
             message.setBooleanProperty(JMSBindingConstants.FAULT_PROPERTY, 
true);
             return message;
 

Modified: 
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java?rev=732415&r1=732414&r2=732415&view=diff
==============================================================================
--- 
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
 (original)
+++ 
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
 Wed Jan  7 10:27:33 2009
@@ -204,7 +204,7 @@
                     if ((e.getCause().getCause() instanceof RuntimeException)) 
{
                         tuscanyMsg.setFaultBody(e.getCause());
                     } else {
-                        tuscanyMsg.setFaultBody(e.getCause().getCause());
+                        
tuscanyMsg.setFaultBody(((InvocationTargetException)e.getCause()).getTargetException());
                     }
                 } else {
                     tuscanyMsg.setFaultBody(e);