From 181fb03e7e6ed89102a8b5f0acfddf88d148d55c Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Mon, 22 Jul 2013 17:12:02 -0700
Subject: [PATCH] CLOUDSTACK-3716:NPE triggered in DownloadListener

---
 .../apache/cloudstack/storage/volume/VolumeServiceImpl.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 9338d3807e9..3b544b18023 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -1045,6 +1045,11 @@ public class VolumeServiceImpl implements VolumeService {
         List<VolumeDataStoreVO> toBeDownloaded = new ArrayList<VolumeDataStoreVO>(dbVolumes);
         for (VolumeDataStoreVO volumeStore : dbVolumes) {
             VolumeVO volume = _volumeDao.findById(volumeStore.getVolumeId());
+            if (volume == null ){
+                s_logger.warn("Volume_store_ref shows that volume " + volumeStore.getVolumeId() + " is on image store " + storeId
+                        + ", but the volume is not found in volumes table, potentially some bugs in deleteVolume, so we just treat this volume to be deleted");
+                continue;
+            }
             // Exists then don't download
             if (volumeInfos.containsKey(volume.getId())) {
                 TemplateProp volInfo = volumeInfos.remove(volume.getId());