server: fix NPE case in VolumeApiServiceImpl Signed-off-by: Rohit Yadav <[email protected]> (cherry picked from commit df934c954106a618f8b0aca7e7dfbac890d78244) Signed-off-by: Rohit Yadav <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a07497b3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a07497b3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a07497b3 Branch: refs/heads/master Commit: a07497b3731372bf902aae9569e6d579abaec3f8 Parents: 48ef7e5 Author: Rohit Yadav <[email protected]> Authored: Mon Apr 13 15:33:23 2015 +0530 Committer: Rohit Yadav <[email protected]> Committed: Mon Apr 13 15:47:51 2015 +0530 ---------------------------------------------------------------------- server/src/com/cloud/storage/VolumeApiServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a07497b3/server/src/com/cloud/storage/VolumeApiServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java index cae1e1d..dbae194 100644 --- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java @@ -1650,12 +1650,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; } }
