From 2fd28f2bfff243ed026b377a7fd5b43b76bd3b94 Mon Sep 17 00:00:00 2001
From: Anshul Gangwar <anshul.gangwar@accelerite.com>
Date: Tue, 30 Aug 2016 12:01:20 +0530
Subject: [PATCH] CLOUDSTACK-9691: Fixed unhandeled excetion in list snapshot
 command when a primary store is deleted related to it

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

diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 6a7f0abde1e..eaf48c7bb0a 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();