apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed NPE in listIso API

Browse Source
This commit is contained in:
Alena Prokharchyk 2011-11-24 10:26:38 -08:00
parent 655a9805f3
commit fc2b95d9c3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -2015,11 +2015,13 @@ public class ApiResponseHelper implements ResponseGenerator {
isoResponse.setOsTypeName("");
}
populateOwner(isoResponse, iso);
Account account = ApiDBUtils.findAccountByIdIncludingRemoved(iso.getAccountId());
populateAccount(isoResponse, account.getId());
populateDomain(isoResponse, account.getDomainId());
Account account = UserContext.current().getCaller();
Account caller = UserContext.current().getCaller();
boolean isAdmin = false;
if ((account == null) || BaseCmd.isAdmin(account.getType())) {
if ((caller == null) || BaseCmd.isAdmin(caller.getType())) {
isAdmin = true;
}
// Add the zone ID
@ -2028,7 +2030,7 @@ public class ApiResponseHelper implements ResponseGenerator {
isoResponse.setZoneName(datacenter.getName());
// If the user is an admin, add the template download status
if (isAdmin || account.getId() == iso.getAccountId()) {
if (isAdmin || caller.getId() == iso.getAccountId()) {
// add download status
if (isoHost.getDownloadState() != Status.DOWNLOADED) {
String isoStatus = "Processing";