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 2013/12/05 20:58:58 UTC
svn commit: r1548259 -
/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
Author: dkulp
Date: Thu Dec 5 19:58:58 2013
New Revision: 1548259
URL: http://svn.apache.org/r1548259
Log:
Merged revisions 1548258 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1548258 | dkulp | 2013-12-05 14:56:18 -0500 (Thu, 05 Dec 2013) | 2 lines
[CXF-5427] Change ClientFaultConverter to be an AbstractInDatabindingInterceptor to leverage the calls for the get readers that would setup validation and such.
........
Modified:
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java?rev=1548259&r1=1548258&r2=1548259&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java Thu Dec 5 19:58:58 2013
@@ -47,7 +47,6 @@ import org.apache.cxf.helpers.XPathUtils
import org.apache.cxf.message.FaultMode;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
@@ -58,7 +57,7 @@ import org.apache.cxf.staxutils.W3CDOMSt
/**
* Takes a Fault and converts it to a local exception type if possible.
*/
-public class ClientFaultConverter extends AbstractPhaseInterceptor<Message> {
+public class ClientFaultConverter extends AbstractInDatabindingInterceptor {
public static final String DISABLE_FAULT_MAPPING = "disable-fault-mapping";
private static final Logger LOG = LogUtils.getLogger(ClientFaultConverter.class);
@@ -147,11 +146,11 @@ public class ClientFaultConverter extend
Object e = null;
if (isDOMSupported(dataBinding)) {
- DataReader<Node> reader = dataBinding.createReader(Node.class);
+ DataReader<Node> reader = this.getNodeDataReader(msg);
reader.setProperty(DataReader.FAULT, fault);
e = reader.read(part, exDetail);
} else {
- DataReader<XMLStreamReader> reader = dataBinding.createReader(XMLStreamReader.class);
+ DataReader<XMLStreamReader> reader = this.getDataReader(msg);
XMLStreamReader xsr = new W3CDOMStreamReader(exDetail);
try {
xsr.nextTag();