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/03/06 17:58:22 UTC
svn commit: r750980 - in /cxf/branches/2.1.x-fixes: ./
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/
rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/
Author: dkulp
Date: Fri Mar 6 16:58:22 2009
New Revision: 750980
URL: http://svn.apache.org/viewvc?rev=750980&view=rev
Log:
Merged revisions 749890 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r749890 | dkulp | 2009-03-03 22:38:10 -0500 (Tue, 03 Mar 2009) | 2 lines
Fix issues where the response code for faults is potentially set AFTER data has already started to stream back to the client.
........
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
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 6 16:58:22 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
8223,748305,748313,748603-748604,748768,749420,749449,749454-749456,749505,749511,749513,749584,749767,749771,749799
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
8223,748305,748313,748603-748604,748768,749420,749449,749454-749456,749505,749511,749513,749584,749767,749771,749799,749890
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=750980&r1=750979&r2=750980&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 Fri Mar 6 16:58:22 2009
@@ -44,101 +44,110 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(Soap11FaultOutInterceptor.class);
public Soap11FaultOutInterceptor() {
- super(Phase.MARSHAL);
+ super(Phase.PREPARE_SEND);
}
-
public void handleMessage(SoapMessage message) throws Fault {
message.put(org.apache.cxf.message.Message.RESPONSE_CODE, new Integer(500));
-
- XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
- Fault f = (Fault) message.getContent(Exception.class);
-
- SoapFault fault = SoapFault.createFault(f, message.getVersion());
-
- try {
- Map<String, String> namespaces = fault.getNamespaces();
- for (Map.Entry<String, String> e : namespaces.entrySet()) {
- writer.writeNamespace(e.getKey(), e.getValue());
- }
-
- String ns = message.getVersion().getNamespace();
- String defaultPrefix = writer.getPrefix(ns);
- if (defaultPrefix == null) {
- defaultPrefix = StaxUtils.getUniquePrefix(writer, ns, false);
- writer.writeStartElement(defaultPrefix, "Fault", ns);
- writer.writeNamespace(defaultPrefix, ns);
- } else {
- writer.writeStartElement(defaultPrefix, "Fault", ns);
- }
-
- writer.writeStartElement("faultcode");
-
- String codeString = fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
- defaultPrefix);
-
- writer.writeCharacters(codeString);
- writer.writeEndElement();
-
- writer.writeStartElement("faultstring");
- if (fault.getMessage() != null) {
- writer.writeCharacters(fault.getMessage());
- } else {
- writer.writeCharacters("Fault occurred while processing.");
- }
- writer.writeEndElement();
- String config = (String)message.getContextualProperty(
- org.apache.cxf.message.Message.FAULT_STACKTRACE_ENABLED);
- if (config != null && Boolean.valueOf(config).booleanValue() && fault.getCause() != null) {
- StringBuffer sb = new StringBuffer();
- for (StackTraceElement ste : fault.getCause().getStackTrace()) {
- sb.append(ste.getClassName() + "!" + ste.getMethodName() + "!" + ste.getFileName()
- + "!" + ste.getLineNumber() + "\n");
- }
- try {
- Element detail = fault.getDetail();
- if (detail == null) {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- Document doc = factory.newDocumentBuilder().newDocument();
- Element stackTrace = doc.createElementNS(Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
- stackTrace.setTextContent(sb.toString());
- detail = doc.createElementNS(Soap11.SOAP_NAMESPACE, "detail");
- fault.setDetail(detail);
- detail.appendChild(stackTrace);
- } else {
- Element stackTrace = detail.getOwnerDocument().createElementNS(
- Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
- detail.appendChild(stackTrace);
- }
- } catch (ParserConfigurationException pe) {
- // move on...
+ message.getInterceptorChain().add(Soap11FaultOutInterceptorInternal.INSTANCE);
+ }
+
+ static class Soap11FaultOutInterceptorInternal extends AbstractSoapInterceptor {
+ static final Soap11FaultOutInterceptorInternal INSTANCE = new Soap11FaultOutInterceptorInternal();
+
+ public Soap11FaultOutInterceptorInternal() {
+ super(Phase.MARSHAL);
+ }
+ public void handleMessage(SoapMessage message) throws Fault {
+ XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
+ Fault f = (Fault) message.getContent(Exception.class);
+
+ SoapFault fault = SoapFault.createFault(f, message.getVersion());
+
+ try {
+ Map<String, String> namespaces = fault.getNamespaces();
+ for (Map.Entry<String, String> e : namespaces.entrySet()) {
+ writer.writeNamespace(e.getKey(), e.getValue());
}
- }
-
- if (fault.hasDetails()) {
- Element detail = fault.getDetail();
- writer.writeStartElement("detail");
-
- Node node = detail.getFirstChild();
- while (node != null) {
- StaxUtils.writeNode(node, writer, true);
- node = node.getNextSibling();
+
+ String ns = message.getVersion().getNamespace();
+ String defaultPrefix = writer.getPrefix(ns);
+ if (defaultPrefix == null) {
+ defaultPrefix = StaxUtils.getUniquePrefix(writer, ns, false);
+ writer.writeStartElement(defaultPrefix, "Fault", ns);
+ writer.writeNamespace(defaultPrefix, ns);
+ } else {
+ writer.writeStartElement(defaultPrefix, "Fault", ns);
}
-
- // Details
+
+ writer.writeStartElement("faultcode");
+
+ String codeString = fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
+ defaultPrefix);
+
+ writer.writeCharacters(codeString);
writer.writeEndElement();
- }
-
- if (fault.getRole() != null) {
- writer.writeStartElement("faultactor");
- writer.writeCharacters(fault.getRole());
+
+ writer.writeStartElement("faultstring");
+ if (fault.getMessage() != null) {
+ writer.writeCharacters(fault.getMessage());
+ } else {
+ writer.writeCharacters("Fault occurred while processing.");
+ }
+ writer.writeEndElement();
+ String config = (String)message.getContextualProperty(
+ org.apache.cxf.message.Message.FAULT_STACKTRACE_ENABLED);
+ if (config != null && Boolean.valueOf(config).booleanValue() && fault.getCause() != null) {
+ StringBuffer sb = new StringBuffer();
+ for (StackTraceElement ste : fault.getCause().getStackTrace()) {
+ sb.append(ste.getClassName() + "!" + ste.getMethodName() + "!" + ste.getFileName()
+ + "!" + ste.getLineNumber() + "\n");
+ }
+ try {
+ Element detail = fault.getDetail();
+ if (detail == null) {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ Document doc = factory.newDocumentBuilder().newDocument();
+ Element stackTrace = doc.createElementNS(Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
+ stackTrace.setTextContent(sb.toString());
+ detail = doc.createElementNS(Soap11.SOAP_NAMESPACE, "detail");
+ fault.setDetail(detail);
+ detail.appendChild(stackTrace);
+ } else {
+ Element stackTrace = detail.getOwnerDocument().createElementNS(
+ Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
+ detail.appendChild(stackTrace);
+ }
+ } catch (ParserConfigurationException pe) {
+ // move on...
+ }
+ }
+
+ if (fault.hasDetails()) {
+ Element detail = fault.getDetail();
+ writer.writeStartElement("detail");
+
+ Node node = detail.getFirstChild();
+ while (node != null) {
+ StaxUtils.writeNode(node, writer, true);
+ node = node.getNextSibling();
+ }
+
+ // Details
+ writer.writeEndElement();
+ }
+
+ if (fault.getRole() != null) {
+ writer.writeStartElement("faultactor");
+ writer.writeCharacters(fault.getRole());
+ writer.writeEndElement();
+ }
+
+ // Fault
writer.writeEndElement();
+ } catch (XMLStreamException xe) {
+ throw new Fault(new Message("XML_WRITE_EXC", BUNDLE), xe);
}
-
- // Fault
- writer.writeEndElement();
- } catch (XMLStreamException xe) {
- throw new Fault(new Message("XML_WRITE_EXC", BUNDLE), xe);
}
}
}
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=750980&r1=750979&r2=750980&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 Fri Mar 6 16:58:22 2009
@@ -34,97 +34,108 @@
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.staxutils.StaxUtils;
public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
- private static final Logger LOG = LogUtils.getL7dLogger(URIMappingInterceptor.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(Soap12FaultOutInterceptor.class);
public Soap12FaultOutInterceptor() {
- super(Phase.MARSHAL);
+ super(Phase.PREPARE_SEND);
}
-
public void handleMessage(SoapMessage message) throws Fault {
- LOG.info(getClass() + (String) message.get(SoapMessage.CONTENT_TYPE));
message.put(org.apache.cxf.message.Message.RESPONSE_CODE, new Integer(500));
+ message.getInterceptorChain().add(Soap12FaultOutInterceptorInternal.INSTANCE);
+ }
+
+ static class Soap12FaultOutInterceptorInternal extends AbstractSoapInterceptor {
+ static final Soap12FaultOutInterceptorInternal INSTANCE = new Soap12FaultOutInterceptorInternal();
- XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
- Fault f = (Fault)message.getContent(Exception.class);
-
- SoapFault fault = SoapFault.createFault(f, message.getVersion());
-
- try {
- Map<String, String> namespaces = fault.getNamespaces();
- for (Map.Entry<String, String> e : namespaces.entrySet()) {
- writer.writeNamespace(e.getKey(), e.getValue());
- }
-
- String ns = message.getVersion().getNamespace();
- String defaultPrefix = StaxUtils.getUniquePrefix(writer, ns, true);
-
- writer.writeStartElement(defaultPrefix, "Fault", ns);
-
- writer.writeStartElement(defaultPrefix, "Code", ns);
- writer.writeStartElement(defaultPrefix, "Value", ns);
-
- writer.writeCharacters(fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
- defaultPrefix));
- writer.writeEndElement();
+ public Soap12FaultOutInterceptorInternal() {
+ super(Phase.MARSHAL);
+ }
+ public void handleMessage(SoapMessage message) throws Fault {
+ LOG.info(getClass() + (String) message.get(SoapMessage.CONTENT_TYPE));
+ message.put(org.apache.cxf.message.Message.RESPONSE_CODE, new Integer(500));
- if (fault.getSubCode() != null) {
- writer.writeStartElement(defaultPrefix, "Subcode", ns);
+ XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
+ Fault f = (Fault)message.getContent(Exception.class);
+
+ SoapFault fault = SoapFault.createFault(f, message.getVersion());
+
+ try {
+ Map<String, String> namespaces = fault.getNamespaces();
+ for (Map.Entry<String, String> e : namespaces.entrySet()) {
+ writer.writeNamespace(e.getKey(), e.getValue());
+ }
+
+ String ns = message.getVersion().getNamespace();
+ String defaultPrefix = StaxUtils.getUniquePrefix(writer, ns, true);
+
+ writer.writeStartElement(defaultPrefix, "Fault", ns);
+
+ writer.writeStartElement(defaultPrefix, "Code", ns);
writer.writeStartElement(defaultPrefix, "Value", ns);
- writer.writeCharacters(fault.getSubCodeString(getFaultCodePrefix(writer, fault.getSubCode()),
- defaultPrefix));
+
+ writer.writeCharacters(fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
+ defaultPrefix));
writer.writeEndElement();
+
+ if (fault.getSubCode() != null) {
+ writer.writeStartElement(defaultPrefix, "Subcode", ns);
+ writer.writeStartElement(defaultPrefix, "Value", ns);
+ writer.writeCharacters(fault.getSubCodeString(getFaultCodePrefix(writer,
+ fault.getSubCode()),
+ defaultPrefix));
+ writer.writeEndElement();
+ writer.writeEndElement();
+ }
writer.writeEndElement();
- }
- writer.writeEndElement();
-
- writer.writeStartElement(defaultPrefix, "Reason", ns);
- writer.writeStartElement(defaultPrefix, "Text", ns);
- writer.writeAttribute("xml", "http://www.w3.org/XML/1998/namespace", "lang ", getLangCode());
- if (fault.getMessage() != null) {
- writer.writeCharacters(fault.getMessage());
- } else {
- writer.writeCharacters("Fault occurred while processing.");
- }
- writer.writeEndElement();
- writer.writeEndElement();
-
- if (fault.hasDetails()) {
- Element detail = fault.getDetail();
- writer.writeStartElement(defaultPrefix, "Detail", ns);
-
- Node node = detail.getFirstChild();
- while (node != null) {
- StaxUtils.writeNode(node, writer, true);
- node = node.getNextSibling();
+
+ writer.writeStartElement(defaultPrefix, "Reason", ns);
+ writer.writeStartElement(defaultPrefix, "Text", ns);
+ writer.writeAttribute("xml", "http://www.w3.org/XML/1998/namespace", "lang ", getLangCode());
+ if (fault.getMessage() != null) {
+ writer.writeCharacters(fault.getMessage());
+ } else {
+ writer.writeCharacters("Fault occurred while processing.");
}
-
- // Details
writer.writeEndElement();
- }
-
- if (fault.getRole() != null) {
- writer.writeStartElement("faultactor");
- writer.writeCharacters(fault.getRole());
writer.writeEndElement();
+
+ if (fault.hasDetails()) {
+ Element detail = fault.getDetail();
+ writer.writeStartElement(defaultPrefix, "Detail", ns);
+
+ Node node = detail.getFirstChild();
+ while (node != null) {
+ StaxUtils.writeNode(node, writer, true);
+ node = node.getNextSibling();
+ }
+
+ // Details
+ writer.writeEndElement();
+ }
+
+ if (fault.getRole() != null) {
+ writer.writeStartElement("faultactor");
+ writer.writeCharacters(fault.getRole());
+ writer.writeEndElement();
+ }
+
+ // Fault
+ writer.writeEndElement();
+ } catch (XMLStreamException xe) {
+ throw new Fault(new Message("XML_WRITE_EXC", LOG), xe);
}
-
- // Fault
- writer.writeEndElement();
- } catch (XMLStreamException xe) {
- throw new Fault(new Message("XML_WRITE_EXC", LOG), xe);
}
- }
-
- private String getLangCode() {
- String code = LOG.getResourceBundle().getLocale().getDisplayLanguage();
- if (StringUtils.isEmpty(code)) {
- return "en";
+
+ private String getLangCode() {
+ String code = LOG.getResourceBundle().getLocale().getDisplayLanguage();
+ if (StringUtils.isEmpty(code)) {
+ return "en";
+ }
+ return code;
}
- return code;
}
-}
+}
\ No newline at end of file
Modified: cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java?rev=750980&r1=750979&r2=750980&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java (original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java Fri Mar 6 16:58:22 2009
@@ -32,6 +32,8 @@
import org.apache.cxf.binding.soap.Soap12;
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.binding.soap.interceptor.Soap12FaultOutInterceptor.Soap12FaultOutInterceptorInternal;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.ExchangeImpl;
@@ -58,8 +60,7 @@
m.setContent(XMLStreamWriter.class, writer);
- Soap11FaultOutInterceptor interceptor = new Soap11FaultOutInterceptor();
- interceptor.handleMessage(m);
+ Soap11FaultOutInterceptorInternal.INSTANCE.handleMessage(m);
writer.writeEndElement();
writer.writeEndDocument();
@@ -103,8 +104,7 @@
m.setContent(XMLStreamWriter.class, writer);
- Soap12FaultOutInterceptor interceptor = new Soap12FaultOutInterceptor();
- interceptor.handleMessage(m);
+ Soap12FaultOutInterceptorInternal.INSTANCE.handleMessage(m);
writer.writeEndElement();
writer.writeEndDocument();