From 972caf1936f338d5f10c6bca7d32d29b785182d7 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Wed, 19 Oct 2011 10:43:36 -0700
Subject: [PATCH] bug 11777: resolved NPE in listIsos - get domain id from the
 iso's account owner object status 11777: resolved fixed

---
 server/src/com/cloud/api/ApiResponseHelper.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index eacedc159fc..c449232e910 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1479,7 +1479,10 @@ public class ApiResponseHelper implements ResponseGenerator {
             isoResponse.setChecksum(iso.getChecksum());
             isoResponse.setPasswordEnabled(false);
             
-            populateOwner(isoResponse, iso);
+            // add account ID and name
+            Account owner = ApiDBUtils.findAccountById(iso.getAccountId());
+            populateAccount(isoResponse, owner.getId());
+            populateDomain(isoResponse, owner.getDomainId());
             
             isoResponse.setObjectName("iso");
             isoResponses.add(isoResponse);