From af4459f24f7c1dd42995b8643176a0b35557b39c Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 4 Apr 2011 11:36:49 -0700
Subject: [PATCH] Fixed list* api commands.

---
 api/src/com/cloud/api/commands/ListHostsCmd.java       |  1 -
 api/src/com/cloud/api/commands/ListHypervisorsCmd.java |  1 -
 api/src/com/cloud/api/response/ListResponse.java       | 10 +++++-----
 server/src/com/cloud/api/ApiServer.java                |  4 ----
 .../com/cloud/api/response/ApiResponseSerializer.java  |  8 +++-----
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/api/src/com/cloud/api/commands/ListHostsCmd.java b/api/src/com/cloud/api/commands/ListHostsCmd.java
index 507a5be8ba9..c84aecd13e2 100644
--- a/api/src/com/cloud/api/commands/ListHostsCmd.java
+++ b/api/src/com/cloud/api/commands/ListHostsCmd.java
@@ -27,7 +27,6 @@ import com.cloud.api.ApiConstants;
 import com.cloud.api.BaseListCmd;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.CommandType;
 import com.cloud.api.response.HostResponse;
 import com.cloud.api.response.ListResponse;
 import com.cloud.async.AsyncJob;
diff --git a/api/src/com/cloud/api/commands/ListHypervisorsCmd.java b/api/src/com/cloud/api/commands/ListHypervisorsCmd.java
index b25dd5edbde..38cfe3a12f7 100644
--- a/api/src/com/cloud/api/commands/ListHypervisorsCmd.java
+++ b/api/src/com/cloud/api/commands/ListHypervisorsCmd.java
@@ -38,7 +38,6 @@ public class ListHypervisorsCmd extends BaseCmd {
 	public String getCommandName() {
 		return s_name;
 	}
-	
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
diff --git a/api/src/com/cloud/api/response/ListResponse.java b/api/src/com/cloud/api/response/ListResponse.java
index 4ff02b6a503..fd8682ce077 100644
--- a/api/src/com/cloud/api/response/ListResponse.java
+++ b/api/src/com/cloud/api/response/ListResponse.java
@@ -6,7 +6,6 @@ import com.cloud.api.ResponseObject;
 
 public class ListResponse<T extends ResponseObject> extends BaseResponse {
     List<T> responses;
-    Integer count;
 
     public List<T> getResponses() {
         return responses;
@@ -17,10 +16,11 @@ public class ListResponse<T extends ResponseObject> extends BaseResponse {
     }
 
     public Integer getCount() {
-        return count;
+        if (responses != null) {
+            return responses.size();
+        } else {
+            return null;
+        }
     }
 
-    public void setCount(Integer count) {
-        this.count = count;
-    }
 }
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index c436a4d07cd..dc8878cb55b 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -445,10 +445,6 @@ public class ApiServer implements HttpRequestHandler {
         if (responses != null && responses.size() > defaultPageLimit && command.getPage() == null && command.getPageSize() == null) {
             throw new ServerApiException(BaseCmd.PAGE_LIMIT_EXCEED, "Number of returned objects per page exceed default page limit " + defaultPageLimit + "; please specify \"page\"/\"pagesize\" parameters");
         }
-        
-        if (responses.size() > 0) {
-            ((ListResponse<ResponseObject>)command.getResponseObject()).setCount(responses.size());   
-        }
     }
     
     private void buildAsyncListResponse(BaseListCmd command, Account account) {
diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java
index 89ce0c9accd..7a2655d6948 100644
--- a/server/src/com/cloud/api/response/ApiResponseSerializer.java
+++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java
@@ -92,13 +92,11 @@ public class ApiResponseSerializer {
         StringBuilder sb = new StringBuilder();
         sb.append("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>");
         sb.append("<" + result.getResponseName() + " cloud-stack-version=\""+ApiDBUtils.getVersion()+ "\">");
-        
-        if (((ListResponse)result).getCount() != null) {
-            sb.append("<" + ApiConstants.COUNT + ">" + ((ListResponse)result).getCount() + "</" + ApiConstants.COUNT + ">");
-
-        }
 
         if (result instanceof ListResponse) {
+            if (((ListResponse)result).getCount() != null) {
+                sb.append("<" + ApiConstants.COUNT + ">" + ((ListResponse)result).getCount() + "</" + ApiConstants.COUNT + ">");
+            }
             List<? extends ResponseObject> responses = ((ListResponse)result).getResponses();
             if ((responses != null) && !responses.isEmpty()) {
                 for (ResponseObject obj : responses) {