svn commit: r545250 - in /webservices/axis2/trunk/java/modules: jaxws/src/org/apache/axis2/jaxws/server/ jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ kernel/src/org/apache/axis2/util/

[dims]

Author: dims
Date: Thu Jun  7 10:49:17 2007
New Revision: 545250

URL: http://svn.apache.org/viewvc?view=rev&rev=545250
Log:
oops! - why did m2 not complain?

Modified:
    
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java
    
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
    
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java

Modified: 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java?view=diff&rev=545250&r1=545249&r2=545250
==============================================================================
--- 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java
 Thu Jun  7 10:49:17 2007
@@ -354,7 +354,7 @@
                     .create(Protocol.soap11);  // always soap11 according to 
the spec
             msg.setXMLFault(xmlfault);
             MessageContext responseMsgCtx =
-                    
MessageContextUtils.createFaultMessageContext(requestMsgCtx);
+                    
MessageContextUtils.createFaultMessageContext(requestMsgCtx, null);
             responseMsgCtx.setMessage(msg);
             return responseMsgCtx;
         } catch (XMLStreamException e) {

Modified: 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java?view=diff&rev=545250&r1=545249&r2=545250
==============================================================================
--- 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
 Thu Jun  7 10:49:17 2007
@@ -124,7 +124,7 @@
 
         MessageContext responseMsgCtx = null;
         if (faultThrown) {
-            responseMsgCtx = MessageContextUtils.createFaultMessageContext(mc);
+            responseMsgCtx = MessageContextUtils.createFaultMessageContext(mc, 
fault);
             responseMsgCtx.setMessage(message);
         } else {
             responseMsgCtx = 
MessageContextUtils.createResponseMessageContext(mc);

Modified: 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?view=diff&rev=545250&r1=545249&r2=545250
==============================================================================
--- 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
 Thu Jun  7 10:49:17 2007
@@ -524,7 +524,7 @@
                 }
             }
         }  else {
-            if (message == null || "".equals(message)) {
+            if (e != null && (message == null || "".equals(message))) {
                 message = getFaultReasonFromException(e, context);
             }
         }



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