From ae21f44c7ba7a8c2d93a29dbd426fc85bb2f749a Mon Sep 17 00:00:00 2001
From: Koushik Das <koushik@apache.org>
Date: Wed, 28 Jan 2015 12:44:45 +0530
Subject: [PATCH] volume-upload: Volume uploaded using new POST based upload
 goes to inconsistent state on destroying SSVM Added a check not to cleanup
 volume related entries when SSVM is destroyed for volumes upload using the
 POST based upload feature

---
 .../cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
index ccfeb96f75b..a691a4ca69a 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
@@ -58,7 +58,7 @@ public class VolumeDataStoreDaoImpl extends GenericDaoBase<VolumeDataStoreVO, Lo
     private SearchBuilder<VolumeDataStoreVO> uploadVolumeSearch;
     private SearchBuilder<VolumeVO> volumeOnlySearch;
     private SearchBuilder<VolumeDataStoreVO> uploadVolumeStateSearch;
-    private static final String EXPIRE_DOWNLOAD_URLS_FOR_ZONE = "update volume_store_ref set download_url_created=? where store_id in (select id from image_store where data_center_id=?)";
+    private static final String EXPIRE_DOWNLOAD_URLS_FOR_ZONE = "update volume_store_ref set download_url_created=? where download_url_created is not null and store_id in (select id from image_store where data_center_id=?)";
 
 
     @Inject