[jbossws-commits] JBossWS SVN: r11755 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite/native-tests/scripts and 2 other directories.

Author: jim.ma Date: 2010-03-10 22:30:19 -0500 (Wed, 10 Mar 2010) New Revision: 11755 Removed: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2955/ Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml Log: [JBPAPP-3860]:removed test;[JBAPP-3873]:Swallow the outbound SOAPFaultException in client side handler Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2010-03-11 02:50:32 UTC (rev 11754) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2010-03-11 03:30:19 UTC (rev 11755) @@ -37,8 +37,10 @@ import javax.xml.soap.AttachmentPart; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPException; +import javax.xml.ws.ProtocolException; import javax.xml.ws.addressing.AddressingProperties; import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; import org.jboss.ws.Constants; @@ -76,7 +78,7 @@ public abstract class CommonClient implements StubExt, HeaderSource { // provide logging - private static Logger log = Logger.getLogger(CommonClient.class); + private static java.util.logging.Logger log = Logger.getLogger(CommonClient.class); public static final String SESSION_COOKIES = "org.jboss.ws.maintain.session.cookies"; @@ -393,18 +395,25 @@ } catch (Exception ex) { - log.error("Exception caught while (preparing for) performing the invocation: ", ex); - - // Reverse the message direction - processPivotInternal(msgContext, direction); - - if (faultType[2] != null) - callFaultHandlerChain(portName, faultType[2], ex); - if (faultType[1] != null) - callFaultHandlerChain(portName, faultType[1], ex); - if (faultType[0] != null) - callFaultHandlerChain(portName, faultType[0], ex); - throw ex; + Boolean isOutbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); + if (oneway && isOutbound && ex instanceof ProtocolException) + { + //swallow the outbound SOAPException threw in hanlders + return null; + } + else + { + log.error("Exception caught while (preparing for) performing the invocation: ", ex); + // Reverse the message direction + processPivotInternal(msgContext, direction); + if (faultType[2] != null) + callFaultHandlerChain(portName, faultType[2], ex); + if (faultType[1] != null) + callFaultHandlerChain(portName, faultType[1], ex); + if (faultType[0] != null) + callFaultHandlerChain(portName, faultType[0], ex); + throw ex; + } } finally { Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-03-11 02:50:32 UTC (rev 11754) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-03-11 03:30:19 UTC (rev 11755) @@ -624,19 +624,7 @@ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2949/WEB-INF"> <include name="jboss-web.xml"/> </webinf> - </war> - - <!-- jaxws-jbws2955 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2955.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2955/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2955/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/jbws2955/EndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2955/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - + </war> <!-- jaxws-webserviceref --> <war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes">