From 64210bd16d4229f2f8caef924abe37465ee4d9ad Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Mon, 30 Aug 2010 11:18:43 -0700
Subject: [PATCH] bug 6010: Fixing the list volumes issue, now we filter
 volumes based on the template type and not based on the names

status 6010: resolved fixed
---
 server/src/com/cloud/server/ManagementServerImpl.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 4b1d6a5859b..65761af9c6f 100644
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -5648,8 +5648,14 @@ public class ManagementServerImpl implements ManagementServer {
         for(VolumeVO v:allVolumes)
         {
         	VMTemplateVO template = _templateDao.findById(v.getTemplateId());
-        	if(!template.getUniqueName().equalsIgnoreCase("routing"))
-        		returnableVolumes.add(v);       	
+        	if(template!=null && template.getUniqueName().equalsIgnoreCase("routing"))
+        	{
+        		//do nothing
+        	}
+        	else
+        	{
+        		returnableVolumes.add(v);
+        	}
         }
         
         return returnableVolumes;