Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 951cf567c -> b61228251
[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/b6122825 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b6122825 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b6122825 Branch: refs/heads/2.7.x-fixes Commit: b612282510ceb074afef6094ac2a1467980dac16 Parents: 951cf56 Author: Sergey Beryozkin <[email protected]> Authored: Wed Apr 16 17:03:38 2014 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Apr 16 17:11:44 2014 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 2 +- .../main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b6122825/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java index d904840..08b7327 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java @@ -326,7 +326,7 @@ public class ClientProxyImpl extends AbstractClient implements private static ResponseExceptionMapper<?> findExceptionMapper(Message message, Class<?> exType) { ProviderFactory pf = ProviderFactory.getInstance(message); - return pf.createResponseExceptionMapper(exType); + return pf.createResponseExceptionMapper(message, exType); } private MultivaluedMap<String, String> setRequestHeaders(MultivaluedMap<String, String> headers, http://git-wip-us.apache.org/repos/asf/cxf/blob/b6122825/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java index 8135a3d..ce44efe 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java @@ -397,12 +397,12 @@ public final class 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;
