cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 3d2b6f7
Date Sat, 24 Oct 2015 18:22:57 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 29d42c717 -> 3d2b6f743


CID 1324349: conditionally return -1 or the dc id for the volume

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24500bd0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24500bd0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24500bd0

Branch: refs/heads/master
Commit: 24500bd0e4be822111125c581520feddb0827e55
Parents: 5cacd99
Author: Daan Hoogland <daan@onecht.net>
Authored: Mon Sep 14 15:22:52 2015 +0200
Committer: Daan Hoogland <daan@onecht.net>
Committed: Sat Oct 24 14:01:38 2015 +0200

----------------------------------------------------------------------
 .../apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24500bd0/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
b/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
index 9c7dc46..380040b 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
@@ -239,7 +239,8 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver
{
             result.setResult(answer.getErrorString());
             caller.complete(result);
             String msg = "Failed to upload volume: " + obj.getUuid() + " with error: " +
answer.getErrorString();
-            _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_UPLOAD_FAILED, volStoreVO.getZoneId(),
null, msg, msg);
+            _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_UPLOAD_FAILED,
+                    (volStoreVO == null ? -1L : volStoreVO.getZoneId()), null, msg, msg);
             s_logger.error(msg);
         } else if (answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED)
{
             CreateCmdResult result = new CreateCmdResult(null, null);


Mime
View raw message