cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/3] git commit: updated refs/heads/4.9 to e860249
Date Mon, 20 Feb 2017 10:58:36 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.9 6dced70aa -> e860249e4


CLOUDSTACK-9691: Fixed unhandeled excetion in list snapshot command when
a primary store is deleted related to it


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

Branch: refs/heads/4.9
Commit: 2fd28f2bfff243ed026b377a7fd5b43b76bd3b94
Parents: 6dced70
Author: Anshul Gangwar <anshul.gangwar@accelerite.com>
Authored: Tue Aug 30 12:01:20 2016 +0530
Committer: Anshul Gangwar <anshul.gangwar@accelerite.com>
Committed: Mon Feb 20 11:30:02 2017 +0530

----------------------------------------------------------------------
 server/src/com/cloud/api/ApiResponseHelper.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fd28f2b/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 6a7f0ab..eaf48c7 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -527,6 +527,9 @@ public class ApiResponseHelper implements ResponseGenerator {
 
         long storagePoolId = snapshotStore.getDataStoreId();
         DataStore dataStore = dataStoreMgr.getDataStore(storagePoolId, DataStoreRole.Primary);
+        if (dataStore == null) {
+            return DataStoreRole.Image;
+        }
 
         Map<String, String> mapCapabilities = dataStore.getDriver().getCapabilities();
 


Mime
View raw message