cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/4.2 to 24bf9b8
Date Tue, 23 Jul 2013 00:24:46 GMT
Updated Branches:
  refs/heads/4.2 c70881645 -> 24bf9b855


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/24bf9b85
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24bf9b85
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24bf9b85

Branch: refs/heads/4.2
Commit: 24bf9b8552a1ca5f6b6b1468240eda4ae064702a
Parents: c708816
Author: Min Chen <min.chen@citrix.com>
Authored: Mon Jul 22 17:24:09 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Mon Jul 22 17:24:09 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/24bf9b85/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 7bc1dbf..183d27e 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
@@ -1061,7 +1061,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


Mime
View raw message