From 683b5635e3ed67cac00cc760b284f633baa6a326 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <Alena.Prokharchyk@citrix.com>
Date: Tue, 22 Nov 2011 13:54:28 -0800
Subject: [PATCH] bug 11674: fixed listVolumes by zoneId for
 regularUsers/domainAdmins status 11674: resolved fixed

---
 server/src/com/cloud/server/ManagementServerImpl.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 22beb6db8d5..9f90e542541 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1939,11 +1939,10 @@ public class ManagementServerImpl implements ManagementServer {
         Object keyword = cmd.getKeyword();
         Object type = cmd.getType();
 
-        Object zone = null;
+        Object zoneId = cmd.getZoneId();
         Object pod = null;
         // Object host = null; TODO
         if (isAdmin) {
-            zone = cmd.getZoneId();
             pod = cmd.getPodId();
             // host = cmd.getHostId(); TODO
         } else {
@@ -2020,8 +2019,8 @@ public class ManagementServerImpl implements ManagementServer {
         if (vmInstanceId != null) {
             sc.setParameters("instanceId", vmInstanceId);
         }
-        if (zone != null) {
-            sc.setParameters("dataCenterId", zone);
+        if (zoneId != null) {
+            sc.setParameters("dataCenterId", zoneId);
         }
         if (pod != null) {
             sc.setParameters("podId", pod);