Author: dkulp Date: Thu Oct 15 16:22:35 2009 New Revision: 825552 URL: http://svn.apache.org/viewvc?rev=825552&view=rev Log: Merged revisions 825547 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r825547 | dkulp | 2009-10-15 12:13:06 -0400 (Thu, 15 Oct 2009) | 9 lines Merged revisions 825533 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r825533 | dkulp | 2009-10-15 11:50:20 -0400 (Thu, 15 Oct 2009) | 1 line [CXF-2472] Log exceptions raised while writing out faults. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java?rev=825552&r1=825551&r2=825552&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java Thu Oct 15 16:22:35 2009 @@ -20,11 +20,11 @@ package org.apache.cxf.binding.soap.interceptor; import java.util.Map; -import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import org.w3c.dom.Document; @@ -34,14 +34,13 @@ import org.apache.cxf.binding.soap.Soap11; import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.binding.soap.SoapMessage; -import org.apache.cxf.common.i18n.BundleUtils; -import org.apache.cxf.common.i18n.Message; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.phase.Phase; import org.apache.cxf.staxutils.StaxUtils; public class Soap11FaultOutInterceptor extends AbstractSoapInterceptor { - private static final ResourceBundle BUNDLE = BundleUtils.getBundle(Soap11FaultOutInterceptor.class); + private static final Logger LOG = LogUtils.getL7dLogger(Soap11FaultOutInterceptor.class); public Soap11FaultOutInterceptor() { super(Phase.PREPARE_SEND); @@ -145,8 +144,9 @@ // Fault writer.writeEndElement(); - } catch (XMLStreamException xe) { - throw new Fault(new Message("XML_WRITE_EXC", BUNDLE), xe); + } catch (Exception xe) { + LOG.log(Level.WARNING, "XML_WRITE_EXC", xe); + throw f; } } } Modified: cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java?rev=825552&r1=825551&r2=825552&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java Thu Oct 15 16:22:35 2009 @@ -20,9 +20,9 @@ package org.apache.cxf.binding.soap.interceptor; import java.util.Map; +import java.util.logging.Level; import java.util.logging.Logger; -import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import org.w3c.dom.Element; @@ -31,7 +31,6 @@ import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.interceptor.Soap11FaultOutInterceptor.Soap11FaultOutInterceptorInternal; -import org.apache.cxf.common.i18n.Message; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.interceptor.Fault; @@ -130,8 +129,9 @@ // Fault writer.writeEndElement(); - } catch (XMLStreamException xe) { - throw new Fault(new Message("XML_WRITE_EXC", LOG), xe); + } catch (Exception xe) { + LOG.log(Level.WARNING, "XML_WRITE_EXC", xe); + throw f; } }
