From 80980456457dea26ac578a4ad65d0e4471952701 Mon Sep 17 00:00:00 2001
From: frank <frank.zhang@citrix.com>
Date: Mon, 12 Dec 2011 15:54:44 -0800
Subject: [PATCH] set account details to null in listAccountCmd when there is
 no details

---
 api/src/com/cloud/api/response/AccountResponse.java | 2 +-
 server/src/com/cloud/api/ApiDBUtils.java            | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/api/src/com/cloud/api/response/AccountResponse.java b/api/src/com/cloud/api/response/AccountResponse.java
index aba2974ce72..ae85734d9e0 100755
--- a/api/src/com/cloud/api/response/AccountResponse.java
+++ b/api/src/com/cloud/api/response/AccountResponse.java
@@ -333,7 +333,7 @@ public class AccountResponse extends BaseResponse {
         this.networkDomain = networkDomain;
     }
     
-    public void setDetails(Map details) {
+    public void setDetails(Map<String, String> details) {
     	this.details = details;
     }
     
diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
index 99bb299b8f2..b4ca6a342cd 100755
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -693,8 +693,9 @@ public class ApiDBUtils {
         return _projectMgr.getProjectOwner(projectId).getId();
     }
     
-    public static Map getAccountDetails(long accountId) {
-    	return _accountDetailsDao.findDetails(accountId);
+    public static Map<String, String> getAccountDetails(long accountId) {
+    	Map<String, String> details = _accountDetailsDao.findDetails(accountId);
+    	return details.isEmpty() ? null : details;
     }
 
     public static Map<String, Set<String>> listNetworkOfferingServices(long networkOfferingId) {