Author: sergeyb Date: Fri Oct 21 15:18:10 2011 New Revision: 1187395 URL: http://svn.apache.org/viewvc?rev=1187395&view=rev Log: Merged revisions 1187392 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1187392 | sergeyb | 2011-10-21 16:14:58 +0100 (Fri, 21 Oct 2011) | 9 lines Merged revisions 1187390 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1187390 | sergeyb | 2011-10-21 16:13:43 +0100 (Fri, 21 Oct 2011) | 1 line [CXF-3872] Better exception reporting, patch on behalf of Andrei Shakirin - thanks ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Oct 21 15:18:10 2011 @@ -0,0 +1,2 @@ +/cxf/branches/2.4.x-fixes:1187392 +/cxf/trunk:1187390 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java?rev=1187395&r1=1187394&r2=1187395&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java (original) +++ cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java Fri Oct 21 15:18:10 2011 @@ -22,6 +22,7 @@ package org.apache.cxf.binding.soap.saaj import java.io.IOException; import java.io.OutputStream; +import java.net.ConnectException; import java.util.ArrayList; import java.util.Iterator; import java.util.ResourceBundle; @@ -211,8 +212,13 @@ public class SAAJOutInterceptor extends message.setContent(XMLStreamWriter.class, writer); } } catch (XMLStreamException e) { - throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE), e, message.getVersion() - .getSender()); + if (e.getCause() instanceof ConnectException) { + throw new SoapFault(e.getCause().getMessage(), e, + message.getVersion().getSender()); + } else { + throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE), e, + message.getVersion().getSender()); + } } } }
