Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 822b63baf -> 7a39f287e
Actually fixing JAXRSClientServerBookTest Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7a39f287 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7a39f287 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7a39f287 Branch: refs/heads/2.7.x-fixes Commit: 7a39f287ed48fe134128c0f33edf67deb58b4df6 Parents: 822b63b Author: Sergey Beryozkin <[email protected]> Authored: Tue Mar 11 11:10:00 2014 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Mar 11 11:23:04 2014 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/7a39f287/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 a2543b7..d904840 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 @@ -404,7 +404,7 @@ public class ClientProxyImpl extends AbstractClient implements } } - Map<String, Object> beanParamValues = new HashMap<String, Object>(beanParams.size()); + Map<String, BeanPair> beanParamValues = new HashMap<String, BeanPair>(beanParams.size()); for (Parameter p : beanParams) { beanParamValues.putAll(getValuesFromBeanParam(params[p.getIndex()], PathParam.class)); } @@ -414,7 +414,8 @@ public class ClientProxyImpl extends AbstractClient implements if (p != null) { list.add(convertParamValue(params[p.getIndex()], getParamAnnotations(m, p))); } else if (beanParamValues.containsKey(varName)) { - list.add(convertParamValue(beanParamValues.get(varName), null)); + BeanPair pair = beanParamValues.get(varName); + list.add(convertParamValue(pair.getValue(), pair.getAnns())); } }
