cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: Actually fixing JAXRSClientServerBookTest
Date Tue, 11 Mar 2014 11:10:19 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 08e02bf2a -> 637963158


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

Branch: refs/heads/master
Commit: 637963158121f8cd21e68b20f31c521c86048248
Parents: 08e02bf
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Tue Mar 11 11:10:00 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Tue Mar 11 11:10:00 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/63796315/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 e6690e8..9137d4a 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
@@ -406,7 +406,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));
         }
@@ -416,7 +416,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()));
             }
         }
         


Mime
View raw message