Skip to content

Commit 55c059c

Browse files
resmoyadvr
authored andcommitted
CLOUDSTACK-10144: fix possible NPE in listVlanIpRanges
1 parent 7f6ae15 commit 55c059c

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

server/src/com/cloud/api/ApiResponseHelper.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2365,12 +2365,18 @@ public static void populateOwner(ControlledViewEntityResponse response, Controll
23652365

23662366
private void populateAccount(ControlledEntityResponse response, long accountId) {
23672367
Account account = ApiDBUtils.findAccountById(accountId);
2368-
if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
2368+
if (account == null) {
2369+
s_logger.debug("Unable to find account with id: " + accountId);
2370+
} else if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
23692371
// find the project
23702372
Project project = ApiDBUtils.findProjectByProjectAccountId(account.getId());
2371-
response.setProjectId(project.getUuid());
2372-
response.setProjectName(project.getName());
2373-
response.setAccountName(account.getAccountName());
2373+
if (project != null) {
2374+
response.setProjectId(project.getUuid());
2375+
response.setProjectName(project.getName());
2376+
response.setAccountName(account.getAccountName());
2377+
} else {
2378+
s_logger.debug("Unable to find project with id: " + account.getId());
2379+
}
23742380
} else {
23752381
response.setAccountName(account.getAccountName());
23762382
}

0 commit comments

Comments
 (0)