From df934c954106a618f8b0aca7e7dfbac890d78244 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 13 Apr 2015 15:33:23 +0530 Subject: [PATCH] server: fix NPE case in VolumeApiServiceImpl Signed-off-by: Rohit Yadav --- server/src/com/cloud/storage/VolumeApiServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java index 7fe8893d890..0f17a57ad4b 100644 --- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java @@ -1636,12 +1636,12 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic } HostVO host = null; - StoragePoolVO volumePool = _storagePoolDao.findById(volume.getPoolId()); + StoragePoolVO volumePool = _storagePoolDao.findByIdIncludingRemoved(volume.getPoolId()); if (hostId != null) { host = _hostDao.findById(hostId); - if (host != null && host.getHypervisorType() == HypervisorType.XenServer && volumePool.isManaged()) { + if (host != null && host.getHypervisorType() == HypervisorType.XenServer && volumePool != null && volumePool.isManaged()) { sendCommand = true; } }