You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2012/12/11 19:05:39 UTC
svn commit: r1420313 - in /cxf/branches/2.6.x-fixes: ./
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
Author: ay
Date: Tue Dec 11 18:05:38 2012
New Revision: 1420313
URL: http://svn.apache.org/viewvc?rev=1420313&view=rev
Log:
Merged revisions 1420307 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1420307 | ay | 2012-12-11 18:58:57 +0100 (Tue, 11 Dec 2012) | 1 line
guard agaist inconsistent faults in JaxWsClientProxy
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
Propchange: cxf/branches/2.6.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=1420313&r1=1420312&r2=1420313&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java Tue Dec 11 18:05:38 2012
@@ -219,7 +219,9 @@ public class JaxWsClientProxy extends or
if (role != null) {
soapFault.setFaultActor(role);
}
- if (((SoapFault)ex).getSubCode() != null) {
+ if (((SoapFault)ex).getSubCode() != null
+ && !SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE.equals(soapFault.getNamespaceURI())) {
+ // set the subcode only if it is supported (e.g, 1.2)
soapFault.appendFaultSubcode(((SoapFault)ex).getSubCode());
}