mirror of https://github.com/apache/jclouds.git
Merge pull request #704 from dkoper/master
tested NPE goes away with FGCP expect test
This commit is contained in:
commit
6cdad28359
|
@ -1294,14 +1294,16 @@ public class RestAnnotationProcessor<T> {
|
|||
for (Annotation key : entry.getValue()) {
|
||||
Set<Annotation> extractors = indexToParamExtractor.get(entry.getKey());
|
||||
String paramKey = ((QueryParam) key).value();
|
||||
String paramValue;
|
||||
Object paramValue;
|
||||
if (extractors != null && extractors.size() > 0) {
|
||||
ParamParser extractor = (ParamParser) extractors.iterator().next();
|
||||
paramValue = injector.getInstance(extractor.value()).apply(args[entry.getKey()]);
|
||||
} else {
|
||||
paramValue = args[entry.getKey()].toString();
|
||||
paramValue = args[entry.getKey()];
|
||||
}
|
||||
if (paramValue != null) {
|
||||
queryParamValues.put(paramKey, paramValue.toString());
|
||||
}
|
||||
queryParamValues.put(paramKey, paramValue);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue