From 2e13c9c4777a2a74ec739d45eb00cce5a97061cc Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Tue, 25 Jan 2011 15:49:11 +0530
Subject: [PATCH] use destroy state instead of boolean falg for volumes

---
 server/src/com/cloud/storage/dao/VolumeDaoImpl.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/src/com/cloud/storage/dao/VolumeDaoImpl.java b/server/src/com/cloud/storage/dao/VolumeDaoImpl.java
index 8a7df128c5c..5cba1248ec2 100755
--- a/server/src/com/cloud/storage/dao/VolumeDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VolumeDaoImpl.java
@@ -98,7 +98,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
     public List<VolumeVO> findByAccount(long accountId) {
         SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
         sc.setParameters("accountId", accountId);
-        sc.setParameters("destroyed", false);
+        sc.setParameters("notDestroyed", Volume.State.Destroy);
         return listBy(sc);
     }
     
@@ -121,7 +121,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
     public List<VolumeVO> findByPoolId(long poolId) {
         SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
         sc.setParameters("poolId", poolId);
-        sc.setParameters("destroyed", false);
+        sc.setParameters("notDestroyed", Volume.State.Destroy);
 	    return listBy(sc);
 	}
     
@@ -130,7 +130,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
         SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
         sc.setParameters("instanceId", id);
         sc.setParameters("status", AsyncInstanceCreateStatus.Created);
-        sc.setParameters("destroyed", false);
+        sc.setParameters("notDestroyed", Volume.State.Destroy);
         return listBy(sc);
     }
     
@@ -155,7 +155,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
 	public List<VolumeVO> findByInstanceIdDestroyed(long vmId) {
 		SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
 		sc.setParameters("instanceId", vmId);
-		sc.setParameters("destroyed", true);
+		sc.setParameters("destroyed", Volume.State.Destroy);
 		return listIncludingRemovedBy(sc);
 	}
 	
@@ -164,7 +164,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
 		SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
         sc.setParameters("accountId", accountId);
         sc.setParameters("pod", podId);
-        sc.setParameters("destroyed", false);
+        sc.setParameters("notDestroyed", Volume.State.Destroy);
         sc.setParameters("status", AsyncInstanceCreateStatus.Created);
         
         return listIncludingRemovedBy(sc);
@@ -274,6 +274,8 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
         AllFieldsSearch.and("poolId", AllFieldsSearch.entity().getPoolId(), Op.EQ);
         AllFieldsSearch.and("vType", AllFieldsSearch.entity().getVolumeType(), Op.EQ);
         AllFieldsSearch.and("id", AllFieldsSearch.entity().getId(), Op.EQ);
+        AllFieldsSearch.and("destroyed", AllFieldsSearch.entity().getState(), Op.EQ);
+        AllFieldsSearch.and("notDestroyed", AllFieldsSearch.entity().getState(), Op.NEQ);
         AllFieldsSearch.done();
         
         DetachedAccountIdSearch = createSearchBuilder();