cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r825549 - in /cxf/branches/2.1.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
Date Thu, 15 Oct 2009 16:16:23 GMT
Author: dkulp
Date: Thu Oct 15 16:16:22 2009
New Revision: 825549

URL: http://svn.apache.org/viewvc?rev=825549&view=rev
Log:
Merged revisions 825542 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r825542 | dkulp | 2009-10-15 12:06:52 -0400 (Thu, 15 Oct 2009) | 9 lines
  
  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.1.x-fixes/   (props changed)
    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/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=825549&r1=825548&r2=825549&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:16:22 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 {



Mime
View raw message