You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/12/17 22:05:39 UTC
svn commit: r1423142 -
/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
Author: dkulp
Date: Mon Dec 17 21:05:38 2012
New Revision: 1423142
URL: http://svn.apache.org/viewvc?rev=1423142&view=rev
Log:
Merged revisions 1423134 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1423134 | dkulp | 2012-12-17 15:43:57 -0500 (Mon, 17 Dec 2012) | 10 lines
Merged revisions 1423130 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1423130 | dkulp | 2012-12-17 15:38:39 -0500 (Mon, 17 Dec 2012) | 2 lines
Slight performance optimization
........
........
Modified:
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java?rev=1423142&r1=1423141&r2=1423142&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java Mon Dec 17 21:05:38 2012
@@ -193,7 +193,8 @@ public class URIMappingInterceptor exten
Class[] types = method.getParameterTypes();
- for (String key : queries.keySet()) {
+ for (Map.Entry<String, String> ent : queries.entrySet()) {
+ String key = ent.getKey();
MessagePartInfo inf = null;
for (MessagePartInfo p : operation.getOperationInfo().getInput().getMessageParts()) {
if (p.getConcreteName().getLocalPart().equals(key)) {
@@ -225,11 +226,11 @@ public class URIMappingInterceptor exten
// TODO check the parameter name here
Object param = null;
-
- if (type != null && type.isPrimitive() && queries.get(key) != null) {
- param = PrimitiveUtils.read(queries.get(key), type);
+ String val = ent.getValue();
+ if (type.isPrimitive() && val != null) {
+ param = PrimitiveUtils.read(val, type);
} else {
- param = readType(queries.get(key), type);
+ param = readType(val, type);
}
parameters.set(idx, param);