Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 42A149450 for ; Fri, 21 Oct 2011 15:15:22 +0000 (UTC) Received: (qmail 6860 invoked by uid 500); 21 Oct 2011 15:15:22 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 6818 invoked by uid 500); 21 Oct 2011 15:15:22 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 6811 invoked by uid 99); 21 Oct 2011 15:15:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Oct 2011 15:15:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Oct 2011 15:15:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C80A823888CD for ; Fri, 21 Oct 2011 15:14:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1187392 - in /cxf/branches/2.4.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java Date: Fri, 21 Oct 2011 15:14:58 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111021151458.C80A823888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Oct 21 15:14:58 2011 New Revision: 1187392 URL: http://svn.apache.org/viewvc?rev=1187392&view=rev Log: 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.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 21 15:14:58 2011 @@ -1 +1 @@ -/cxf/trunk:1187376 +/cxf/trunk:1187376,1187390 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.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.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java?rev=1187392&r1=1187391&r2=1187392&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java (original) +++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java Fri Oct 21 15:14:58 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()); + } } } }