From af502b1c4ca9b3528fcc69c696a4e8379273b7c5 Mon Sep 17 00:00:00 2001
From: nit <nitin@cloud.com>
Date: Mon, 8 Nov 2010 14:46:30 +0530
Subject: [PATCH] bug 3384: listVolumes: regular user should be able to make a
 search by "type". status 3384: resolved fixed

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

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 21073be9a92..23b55ee051c 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -3626,13 +3626,12 @@ public class ManagementServerImpl implements ManagementServer {
         Long vmInstanceId = cmd.getVirtualMachineId();
         Object name = cmd.getVolumeName();
         Object keyword = cmd.getKeyword();
+        Object type = cmd.getType();
 
-        Object type = null;
         Object zone = null;
         Object pod = null;
         //Object host = null; TODO
-        if (isAdmin) {
-            type = cmd.getType();
+        if (isAdmin) {            
             zone = cmd.getZoneId();
             pod = cmd.getPodId();
             // host = cmd.getHostId(); TODO