You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/07/23 02:26:42 UTC
git commit: updated refs/heads/master to cc99a83
Updated Branches:
refs/heads/master 181fb03e7 -> cc99a83d7
CLOUDSTACK-3716:NPE triggered in DownloadListener.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc99a83d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc99a83d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc99a83d
Branch: refs/heads/master
Commit: cc99a83d71f399d8679d9bdd81b5f2f7e2cf59ef
Parents: 181fb03
Author: Min Chen <mi...@citrix.com>
Authored: Mon Jul 22 17:24:09 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Mon Jul 22 17:26:33 2013 -0700
----------------------------------------------------------------------
.../org/apache/cloudstack/storage/volume/VolumeServiceImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc99a83d/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
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 3b544b1..5919c27 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
@@ -1047,7 +1047,9 @@ public class VolumeServiceImpl implements VolumeService {
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");
+ + ", but the volume is not found in volumes table, potentially some bugs in deleteVolume, so we just treat this volume to be deleted and mark it as destroyed");
+ volumeStore.setDestroyed(true);
+ _volumeStoreDao.update(volumeStore.getId(), volumeStore);
continue;
}
// Exists then don't download