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

cloudian: let's guard more apis wrt NPEs 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2017-09-21 16:03:37 +05:30
parent 7307168218
commit e9244cf341
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianClient.java
View File

@ -134,6 +134,9 @@ public class CloudianClient {
try {
final HttpResponse response = get(String.format("/user?userId=%s&groupId=%s", userId, groupId));
final ObjectMapper mapper = new ObjectMapper();
if (response.getEntity() == null || response.getEntity().getContent() == null) {
return null;
}
return mapper.readValue(response.getEntity().getContent(), UserInfo.class);
} catch (final IOException e) {
LOG.error("Failed to list Cloudian user due to:", e);
@ -204,6 +207,9 @@ public class CloudianClient {
try {
final HttpResponse response = get("/group/list");
final ObjectMapper mapper = new ObjectMapper();
if (response.getEntity() == null || response.getEntity().getContent() == null) {
return null;
}
return Arrays.asList(mapper.readValue(response.getEntity().getContent(), GroupInfo[].class));
} catch (final IOException e) {
LOG.error("Failed to list Cloudian groups due to:", e);