You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/01/19 07:02:41 UTC
git commit: updated refs/heads/4.3 to 969bbb0
Repository: cloudstack
Updated Branches:
refs/heads/4.3 2c7cacd9d -> 969bbb02a
CLOUDSTACK-8164: Look for all host to avoid NPE
(cherry picked from commit d8def3dc0b6e0099380448d61aa44d5052128acf)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/969bbb02
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/969bbb02
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/969bbb02
Branch: refs/heads/4.3
Commit: 969bbb02a9cd65b72b867cf9ee91c3e35ca95a0c
Parents: 2c7cacd
Author: Abhinandan Prateek <ab...@shapeblue.com>
Authored: Mon Jan 19 11:29:22 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jan 19 11:32:06 2015 +0530
----------------------------------------------------------------------
.../apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java | 6 +++---
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/969bbb02/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java
----------------------------------------------------------------------
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 b1c78dc..07fa505 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java
@@ -79,9 +79,9 @@ public class VMSnapshotHelperImpl implements VMSnapshotHelper {
return vm.getHostId();
// check if lastHostId is available
- if(vm.getLastHostId() != null){
- HostVO lastHost = hostDao.findById(vm.getLastHostId());
- if(lastHost.getStatus() == com.cloud.host.Status.Up && !lastHost.isInMaintenanceStates())
+ if (vm.getLastHostId() != null) {
+ HostVO lastHost = hostDao.findByIdIncludingRemoved(vm.getLastHostId());
+ if (lastHost.getStatus() == com.cloud.host.Status.Up && !lastHost.isInMaintenanceStates())
return lastHost.getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/969bbb02/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index d57659a..84ecbf0 100644
--- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -766,6 +766,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);
}