Repository: cxf Updated Branches: refs/heads/master a02b60fdd -> e46b89691
[CXF-5689] Passing Message to the code initializing response exception mappers Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e46b8969 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e46b8969 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e46b8969 Branch: refs/heads/master Commit: e46b896913aeb510c3370f47eb1229b216da47ed Parents: a02b60f Author: Sergey Beryozkin <sberyoz...@talend.com> Authored: Wed Apr 16 17:03:38 2014 +0100 Committer: Sergey Beryozkin <sberyoz...@talend.com> Committed: Wed Apr 16 17:03:38 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java | 4 ++-- .../main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e46b8969/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java index 3f91b06..e68465f 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java @@ -113,12 +113,12 @@ public final class ClientProviderFactory extends ProviderFactory { @SuppressWarnings("unchecked") public <T extends Throwable> ResponseExceptionMapper<T> createResponseExceptionMapper( - Class<?> paramType) { + Message m, Class<?> paramType) { List<ResponseExceptionMapper<?>> candidates = new LinkedList<ResponseExceptionMapper<?>>(); for (ProviderInfo<ResponseExceptionMapper<?>> em : responseExceptionMappers) { - handleMapper(candidates, em, paramType, null, ResponseExceptionMapper.class, true); + handleMapper(candidates, em, paramType, m, ResponseExceptionMapper.class, true); } if (candidates.size() == 0) { return null; http://git-wip-us.apache.org/repos/asf/cxf/blob/e46b8969/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java index 9137d4a..4cea12a 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java @@ -328,7 +328,7 @@ public class ClientProxyImpl extends AbstractClient implements private static ResponseExceptionMapper<?> findExceptionMapper(Message message, Class<?> exType) { ClientProviderFactory pf = ClientProviderFactory.getInstance(message); - return pf.createResponseExceptionMapper(exType); + return pf.createResponseExceptionMapper(message, exType); } private MultivaluedMap<String, String> setRequestHeaders(MultivaluedMap<String, String> headers,
