From 2611ac75c1a5d8fa24eb83871c396da9dcc1b2ed Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Thu, 22 Aug 2013 14:56:42 -0700
Subject: [PATCH] CLOUDSTACK-4454:object_store - Not able to delete secondary
 storage when existing snapshots are deleted.

---
 .../cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
index f33d51aebe7..d8e6abcf110 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
@@ -68,6 +68,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO
         storeSearch = createSearchBuilder();
         storeSearch.and("store_id", storeSearch.entity().getDataStoreId(), SearchCriteria.Op.EQ);
         storeSearch.and("store_role", storeSearch.entity().getRole(), SearchCriteria.Op.EQ);
+        storeSearch.and("state", storeSearch.entity().getState(), SearchCriteria.Op.NEQ);
         storeSearch.done();
 
         destroyedSearch = createSearchBuilder();
@@ -147,6 +148,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO
         SearchCriteria<SnapshotDataStoreVO> sc = storeSearch.create();
         sc.setParameters("store_id", id);
         sc.setParameters("store_role", role);
+        sc.setParameters("state", ObjectInDataStoreStateMachine.State.Destroyed);
         return listBy(sc);
     }