You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/11/09 15:33:25 UTC

cxf git commit: Putting back InvocationCallback Response check for JAX-RS proxies

Repository: cxf
Updated Branches:
  refs/heads/master 01cd14ce9 -> 535358812


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/53535881
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/53535881
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/53535881

Branch: refs/heads/master
Commit: 53535881221240bc606a61c6bfdd4aae1b890a04
Parents: 01cd14c
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Nov 9 15:33:04 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Nov 9 15:33:04 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/53535881/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 {