From d59cc1ff8fa909d37609410e19142b158cecb2f3 Mon Sep 17 00:00:00 2001
From: Rajesh Battala <rajesh.battala@citrix.com>
Date: Thu, 5 Jun 2014 15:06:11 +0530
Subject: [PATCH] CLOUDSTACK-6831 [Hyper-V] Improve the logging for VM snapshot
 failures as it is not supported. Right now it is throwing NPEs

---
 .../hypervisor/dao/HypervisorCapabilitiesDaoImpl.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
index 2b94e69737d..e83a4add7d8 100644
--- a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
+++ b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
@@ -101,6 +101,12 @@ public class HypervisorCapabilitiesDaoImpl extends GenericDaoBase<HypervisorCapa
     @Override
     public Boolean isVmSnapshotEnabled(HypervisorType hypervisorType, String hypervisorVersion) {
         HypervisorCapabilitiesVO result = getCapabilities(hypervisorType, hypervisorVersion);
-        return result.getVmSnapshotEnabled();
+        // if default capability profile not present for any hypervisor type result will be null.
+        // So returning vm snapshot not supported if there is no default capability profile for hypervisor.
+        if (result != null) {
+            return result.getVmSnapshotEnabled();
+        } else {
+            return false;
+        }
     }
 }