Repository: cloudstack Updated Branches: refs/heads/4.3 e2b49613d -> c1bf7eeee
CLOUDSTACK-7404: Failed to start an instance when originating template has been deleted Signed-off-by: Sebastien Goasguen <run...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c1bf7eee Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c1bf7eee Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c1bf7eee Branch: refs/heads/4.3 Commit: c1bf7eeeeeb3bd4dad384225d411e21859cce470 Parents: e2b4961 Author: Loic Lambiel <l...@exoscale.ch> Authored: Mon Sep 1 10:31:57 2014 +0200 Committer: Sebastien Goasguen <run...@gmail.com> Committed: Fri Sep 5 17:28:33 2014 +0200 ---------------------------------------------------------------------- .../components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java | 2 +- .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1bf7eee/engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java ---------------------------------------------------------------------- diff --git a/engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java b/engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java index 8282b16..028ef54 100644 --- a/engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java +++ b/engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java @@ -103,7 +103,7 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile { @Override public VirtualMachineTemplate getTemplate() { if (_template == null && _vm != null) { - _template = s_entityMgr.findById(VirtualMachineTemplate.class, _vm.getTemplateId()); + _template = s_entityMgr.findByIdIncludingRemoved(VirtualMachineTemplate.class, _vm.getTemplateId()); } return _template; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1bf7eee/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index 2fd7a52..8bd69f6 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -809,7 +809,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac VMInstanceVO startedVm = null; ServiceOfferingVO offering = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()); - VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, vm.getTemplateId()); + VirtualMachineTemplate template = _entityMgr.findByIdIncludingRemoved(VirtualMachineTemplate.class, vm.getTemplateId()); if (s_logger.isDebugEnabled()) { s_logger.debug("Trying to deploy VM, vm has dcId: " + vm.getDataCenterId() + " and podId: " + vm.getPodIdToDeployIn());
