Author: dkulp
Date: Thu Oct 15 16:06:52 2009
New Revision: 825542
URL: http://svn.apache.org/viewvc?rev=825542&view=rev
Log:
Merged revisions 825530 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r825530 | dkulp | 2009-10-15 11:49:53 -0400 (Thu, 15 Oct 2009) | 1 line
[CXF-2463] If the message is 1.1, use the 1.1 FaultOutInterceptor
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.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.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java?rev=825542&r1=825541&r2=825542&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
Thu Oct 15 16:06:52 2009
@@ -30,6 +30,7 @@
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;
@@ -45,7 +46,11 @@
}
public void handleMessage(SoapMessage message) throws Fault {
message.put(org.apache.cxf.message.Message.RESPONSE_CODE, new
Integer(500));
-
message.getInterceptorChain().add(Soap12FaultOutInterceptorInternal.INSTANCE);
+ if (message.getVersion().getVersion() == 1.1) {
+
message.getInterceptorChain().add(Soap11FaultOutInterceptorInternal.INSTANCE);
+ } else {
+
message.getInterceptorChain().add(Soap12FaultOutInterceptorInternal.INSTANCE);
+ }
}
static class Soap12FaultOutInterceptorInternal extends
AbstractSoapInterceptor {
