Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 1a670208b -> 171a60f47
Putting back InvocationCallback Response check for JAX-RS proxies Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/171a60f4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/171a60f4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/171a60f4 Branch: refs/heads/3.1.x-fixes Commit: 171a60f47bb6fbe50790bec49abb122301966d6e Parents: 1a67020 Author: Sergey Beryozkin <[email protected]> Authored: Wed Nov 9 15:33:04 2016 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Nov 9 15:35:10 2016 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/171a60f4/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 c82b942..db4d2a4 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 @@ -795,7 +795,8 @@ public class ClientProxyImpl extends AbstractClient implements Class<?> callbackRespClass = getCallbackClass(callbackOutType); Class<?> methodReturnType = ori.getMethodToInvoke().getReturnType(); - if (callbackRespClass.isAssignableFrom(methodReturnType) + if (Response.class == callbackRespClass + || callbackRespClass.isAssignableFrom(methodReturnType) || PrimitiveUtils.canPrimitiveTypeBeAutoboxed(methodReturnType, callbackRespClass)) { return callback; } else {
