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 2012/04/24 20:52:09 UTC
svn commit: r1329937 - in /cxf/branches/2.4.x-fixes: ./
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
Author: dkulp
Date: Tue Apr 24 18:52:08 2012
New Revision: 1329937
URL: http://svn.apache.org/viewvc?rev=1329937&view=rev
Log:
Merged revisions 1329925 via svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1329925 | dkulp | 2012-04-24 14:42:23 -0400 (Tue, 24 Apr 2012) | 9 lines
Merged revisions 1329905 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1329905 | dkulp | 2012-04-24 14:07:23 -0400 (Tue, 24 Apr 2012) | 2 lines
[CXF-4265] Fix potential NPE when createing soap faults.
........
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java?rev=1329937&r1=1329936&r2=1329937&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java Tue Apr 24 18:52:08 2012
@@ -125,7 +125,8 @@ public class Soap12FaultInInterceptor ex
fault,
XPathConstants.STRING);
} catch (XMLStreamException e) {
- throw new SoapFault("Could not parse message.",
+ throw new SoapFault("Could not parse message.",
+ e,
message.getVersion().getSender());
}
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=1329937&r1=1329936&r2=1329937&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java Tue Apr 24 18:52:08 2012
@@ -216,7 +216,10 @@ public class JaxWsClientProxy extends or
}
soapFault.setFaultString(((SoapFault)ex).getReason());
soapFault.setFaultCode(((SoapFault)ex).getFaultCode());
- soapFault.setFaultActor(((SoapFault)ex).getRole());
+ String role = ((SoapFault)ex).getRole();
+ if (role != null) {
+ soapFault.setFaultActor(role);
+ }
if (((SoapFault)ex).getSubCode() != null) {
soapFault.appendFaultSubcode(((SoapFault)ex).getSubCode());
}