From 9338abb6f369dfa792b70335d216b5774c44dd1d Mon Sep 17 00:00:00 2001 From: Mike Tutkowski Date: Thu, 6 Nov 2014 19:49:44 -0700 Subject: [PATCH] Check to see if the Map of capabilities passed back from the storage driver is null. --- server/src/com/cloud/api/ApiResponseHelper.java | 10 ++++++---- server/src/com/cloud/template/TemplateManagerImpl.java | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 81729874aa5..f4be820048f 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -517,11 +517,13 @@ public class ApiResponseHelper implements ResponseGenerator { Map mapCapabilities = dataStore.getDriver().getCapabilities(); - String value = mapCapabilities.get(DataStoreCapabilities.STORAGE_SYSTEM_SNAPSHOT.toString()); - Boolean supportsStorageSystemSnapshots = new Boolean(value); + if (mapCapabilities != null) { + String value = mapCapabilities.get(DataStoreCapabilities.STORAGE_SYSTEM_SNAPSHOT.toString()); + Boolean supportsStorageSystemSnapshots = new Boolean(value); - if (supportsStorageSystemSnapshots) { - return DataStoreRole.Primary; + if (supportsStorageSystemSnapshots) { + return DataStoreRole.Primary; + } } return DataStoreRole.Image; diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index da3940ca345..0da602c2c80 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -1485,11 +1485,13 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, Map mapCapabilities = dataStore.getDriver().getCapabilities(); - String value = mapCapabilities.get(DataStoreCapabilities.STORAGE_SYSTEM_SNAPSHOT.toString()); - Boolean supportsStorageSystemSnapshots = new Boolean(value); + if (mapCapabilities != null) { + String value = mapCapabilities.get(DataStoreCapabilities.STORAGE_SYSTEM_SNAPSHOT.toString()); + Boolean supportsStorageSystemSnapshots = new Boolean(value); - if (supportsStorageSystemSnapshots) { - return DataStoreRole.Primary; + if (supportsStorageSystemSnapshots) { + return DataStoreRole.Primary; + } } return DataStoreRole.Image;