svn commit: r534739 - in /webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: FaultHandler.java core/axis2/SynapseCallbackReceiver.java

[asankha]

Author: asankha
Date: Thu May  3 00:32:59 2007
New Revision: 534739

URL: http://svn.apache.org/viewvc?view=rev&rev=534739
Log:
fix SYNAPSE-92

Modified:
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/FaultHandler.java
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/FaultHandler.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/FaultHandler.java?view=diff&rev=534739&r1=534738&r2=534739
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/FaultHandler.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/FaultHandler.java
 Thu May  3 00:32:59 2007
@@ -52,8 +52,10 @@
         if (synCtx.getProperty(Constants.ERROR_CODE) == null) {
             synCtx.setProperty(Constants.ERROR_CODE, "00000");
         }
-        // use only the first line as the message for multiline exception 
messages (Axis2 has these)
-        synCtx.setProperty(Constants.ERROR_MESSAGE, 
e.getMessage().split("\n")[0]);
+        if (synCtx.getProperty(Constants.ERROR_MESSAGE) == null) {
+            // use only the first line as the message for multiline exception 
messages (Axis2 has these)
+            synCtx.setProperty(Constants.ERROR_MESSAGE, 
e.getMessage().split("\n")[0]);
+        }
         synCtx.setProperty(Constants.ERROR_DETAIL, getStackTrace(e));
 
         try {

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java?view=diff&rev=534739&r1=534738&r2=534739
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
 Thu May  3 00:32:59 2007
@@ -112,6 +112,9 @@
                 // set an error code to the message context, so that error 
sequences can filter
                 // using that property to determine the cause of error
                 synapseOutMsgCtx.setProperty(Constants.ERROR_CODE, 
Constants.SENDING_FAULT);
+                if (fault != null && fault.getReason() != null) {
+                    synapseOutMsgCtx.setProperty(Constants.ERROR_MESSAGE, 
fault.getReason().getText());
+                }
 
                 ((FaultHandler) 
faultStack.pop()).handleFault(synapseOutMsgCtx, e);
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]