From d8def3dc0b6e0099380448d61aa44d5052128acf Mon Sep 17 00:00:00 2001 From: Abhinandan Prateek Date: Mon, 19 Jan 2015 11:29:22 +0530 Subject: [PATCH] CLOUDSTACK-8164: Look for all host to avoid NPE Signed-off-by: Rohit Yadav (cherry picked from commit a1a601be5a08a42739c3ef999f551db1b7bd7749) Signed-off-by: Rohit Yadav --- .../apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java | 2 +- server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java b/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java index a1bcd45d3a2..cadbad3341a 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java @@ -82,7 +82,7 @@ public class VMSnapshotHelperImpl implements VMSnapshotHelper { // check if lastHostId is available if (vm.getLastHostId() != null) { - HostVO lastHost = hostDao.findById(vm.getLastHostId()); + HostVO lastHost = hostDao.findByIdIncludingRemoved(vm.getLastHostId()); if (lastHost.getStatus() == com.cloud.host.Status.Up && !lastHost.isInMaintenanceStates()) return lastHost.getId(); } diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java index 5ead59aadc1..b49db9b51c1 100644 --- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java +++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java @@ -760,6 +760,8 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana if (jobResult != null) { if (jobResult instanceof ConcurrentOperationException) throw (ConcurrentOperationException)jobResult; + else if (jobResult instanceof InvalidParameterValueException) + throw (InvalidParameterValueException)jobResult; else if (jobResult instanceof Throwable) throw new RuntimeException("Unexpected exception", (Throwable)jobResult); }