From 1db8053e54cff7e0dd6506a5b8702fe46a2f4b6c Mon Sep 17 00:00:00 2001
From: Darrin Husselmann <darrinhusselmann@hotmail.co.za>
Date: Fri, 5 Jun 2020 11:23:00 +0200
Subject: [PATCH] Fixed null pointer

---
 .../cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java
index 11d61df3d7f7..f8be1adee565 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java
@@ -73,6 +73,9 @@ public List<SnapshotInfo> getSnapshots(long volumeId, DataStoreRole role) {
         for (SnapshotDataStoreVO snapshotDataStoreVO : allSnapshotsFromVolumeAndDataStore) {
             DataStore store = storeMgr.getDataStore(snapshotDataStoreVO.getDataStoreId(), role);
             SnapshotVO snapshot = snapshotDao.findById(snapshotDataStoreVO.getSnapshotId());
+            if (snapshot == null){ //snapshot may have been removed;
+                continue;
+            }
             SnapshotObject info = SnapshotObject.getSnapshotObject(snapshot, store);
 
             infos.add(info);