Repository: cxf Updated Branches: refs/heads/master 6b35ed0f2 -> a77bc949e
[CXF-7147] Support for Object InvocationCallback, patch from John Poth applied, This closes #204 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a77bc949 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a77bc949 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a77bc949 Branch: refs/heads/master Commit: a77bc949ee3247a74a9c24ae67cc90019553b226 Parents: 6b35ed0 Author: Sergey Beryozkin <[email protected]> Authored: Tue Nov 22 16:53:47 2016 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Nov 22 16:53:47 2016 +0000 ---------------------------------------------------------------------- core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java | 3 ++- .../main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a77bc949/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java index 16408d8..dc131de 100644 --- a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java +++ b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java @@ -32,7 +32,8 @@ public final class PrimitiveUtils { AUTOBOXED_PRIMITIVES_MAP.put(long.class, Long.class); AUTOBOXED_PRIMITIVES_MAP.put(float.class, Float.class); AUTOBOXED_PRIMITIVES_MAP.put(double.class, Double.class); - AUTOBOXED_PRIMITIVES_MAP.put(boolean.class, Boolean.class); + AUTOBOXED_PRIMITIVES_MAP.put(boolean.class, Boolean.class); + AUTOBOXED_PRIMITIVES_MAP.put(void.class, Void.class); } private PrimitiveUtils() { http://git-wip-us.apache.org/repos/asf/cxf/blob/a77bc949/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 27f39f7..af3c015 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 @@ -800,7 +800,7 @@ public class ClientProxyImpl extends AbstractClient implements Class<?> callbackRespClass = getCallbackClass(callbackOutType); Class<?> methodReturnType = ori.getMethodToInvoke().getReturnType(); - if (Response.class == callbackRespClass + if (Object.class == callbackRespClass || callbackRespClass.isAssignableFrom(methodReturnType) || PrimitiveUtils.canPrimitiveTypeBeAutoboxed(methodReturnType, callbackRespClass)) { return callback;
