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

cloudian: more npe fixes, around response contents (this needs fixing) 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2017-09-21 15:58:47 +05:30
parent 2188815dfd
commit 7307168218
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

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