Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #704 from dkoper/master 

tested NPE goes away with FGCP expect test
This commit is contained in:
Adrian Cole 2012-07-09 00:04:59 -07:00
parent c47950c9ab 43f12fa627
commit 6cdad28359
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
View File

@ -1294,14 +1294,16 @@ public class RestAnnotationProcessor<T> {
for (Annotation key : entry.getValue()) { for (Annotation key : entry.getValue()) {
Set<Annotation> extractors = indexToParamExtractor.get(entry.getKey()); Set<Annotation> extractors = indexToParamExtractor.get(entry.getKey());
String paramKey = ((QueryParam) key).value(); String paramKey = ((QueryParam) key).value();
String paramValue; Object paramValue;
if (extractors != null && extractors.size() > 0) { if (extractors != null && extractors.size() > 0) {
ParamParser extractor = (ParamParser) extractors.iterator().next(); ParamParser extractor = (ParamParser) extractors.iterator().next();
paramValue = injector.getInstance(extractor.value()).apply(args[entry.getKey()]); paramValue = injector.getInstance(extractor.value()).apply(args[entry.getKey()]);
} else { } else {
paramValue = args[entry.getKey()].toString(); paramValue = args[entry.getKey()];
}
if (paramValue != null) {
queryParamValues.put(paramKey, paramValue.toString());
} }
queryParamValues.put(paramKey, paramValue);
} }
} }