svn commit: r545235 - in /webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws: core/util/MessageContextUtils.java server/dispatcher/ProviderDispatcher.java

[dims]

Author: dims
Date: Thu Jun  7 09:31:59 2007
New Revision: 545235

URL: http://svn.apache.org/viewvc?view=rev&rev=545235
Log:
fix build break caused by null exception being passed to 
createFaultMessageContext

Modified:
    
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java
    
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java

Modified: 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java?view=diff&rev=545235&r1=545234&r2=545235
==============================================================================
--- 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java
 Thu Jun  7 09:31:59 2007
@@ -71,11 +71,11 @@
      * @param mc
      * @return
      */
-    public static MessageContext createFaultMessageContext(MessageContext mc) {
+    public static MessageContext createFaultMessageContext(MessageContext mc, 
Throwable t) {
         try {
             org.apache.axis2.context.MessageContext faultMC =
                     MessageContextBuilder.createFaultMessageContext(
-                            mc.getAxisMessageContext(), null);
+                            mc.getAxisMessageContext(), t);
             MessageContext jaxwsFaultMC = new MessageContext(faultMC);
             jaxwsFaultMC.setEndpointDescription(mc.getEndpointDescription());
             jaxwsFaultMC.setOperationDescription(mc.getOperationDescription());

Modified: 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java?view=diff&rev=545235&r1=545234&r2=545235
==============================================================================
--- 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java
 Thu Jun  7 09:31:59 2007
@@ -171,6 +171,7 @@
         boolean faultThrown = false;
         XMLFault fault = null;
         Object responseParamValue = null;
+        Throwable t = null;
         try {
             responseParamValue = 
(Object)org.apache.axis2.java.security.AccessController
                     .doPrivileged(new PrivilegedExceptionAction() {
@@ -179,7 +180,7 @@
                         }
                     });
         } catch (Exception e) {
-            Throwable t = ClassUtils.getRootCause(e);
+            t = ClassUtils.getRootCause(e);
             faultThrown = true;
             fault = MethodMarshallerUtils.createXMLFaultFromSystemException(t);
 
@@ -197,7 +198,7 @@
                 // If a fault was thrown, we need to create a slightly 
different
                 // MessageContext, than in the response path.
                 Message responseMsg = createMessageFromValue(fault);
-                responseMsgCtx = 
MessageContextUtils.createFaultMessageContext(mc);
+                responseMsgCtx = 
MessageContextUtils.createFaultMessageContext(mc, t);
                 responseMsgCtx.setMessage(responseMsg);
             } else {
                 Message responseMsg = 
createMessageFromValue(responseParamValue);



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