You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/10/15 17:50:21 UTC

svn commit: r825533 - in /cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor: Soap11FaultOutInterceptor.java Soap12FaultOutInterceptor.java

Author: dkulp
Date: Thu Oct 15 15:50:20 2009
New Revision: 825533

URL: http://svn.apache.org/viewvc?rev=825533&view=rev
Log:
[CXF-2472] Log exceptions raised while writing out faults.

Modified:
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java

Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java?rev=825533&r1=825532&r2=825533&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java Thu Oct 15 15:50:20 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/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java?rev=825533&r1=825532&r2=825533&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java Thu Oct 15 15:50:20 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;
             }
         }