You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sc...@apache.org on 2006/12/06 20:37:28 UTC

svn commit: r483193 - /webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java

Author: scheu
Date: Wed Dec  6 11:37:27 2006
New Revision: 483193

URL: http://svn.apache.org/viewvc?view=rev&rev=483193
Log:
AXIS2-1837
Contributor:Mike Rheinheimer
Bug fix for local exception processing

Modified:
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java?view=diff&rev=483193&r1=483192&r2=483193
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java Wed Dec  6 11:37:27 2006
@@ -135,8 +135,14 @@
              * local AxisFault was thrown and we need to save it for later throwing
              * We do not want to create a message and go through the whole handler or
              * XMLFault processing because it's unnecessary.
+             * 
+             * Same is true if we get a valid non-fault server response but some jaxws
+             * client processing (a handler, perhaps) throws an exception.
+             * 
+             * If the response message itself is a fault message, let it pass through.
              */
-            if (response.getMessage() == null && faultexception != null) {
+            if ((faultexception != null) && ((response.getMessage() == null)
+                    || (!response.getMessage().isFault()))) {
                 MessageFactory factory = (MessageFactory) FactoryRegistry.getFactory(MessageFactory.class);
                 Message message = factory.create(request.getMessage().getProtocol());
                 response.setLocalException(faultexception);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org