From 3df3e9fb10234bf80d6f2d42e3c87d43059afdc8 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Wed, 7 Dec 2011 13:56:09 -0800 Subject: [PATCH] bug 12407: for snapshot, there is no vm related to status 12407: resolved fixed --- server/src/com/cloud/vm/VirtualMachineProfileImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/vm/VirtualMachineProfileImpl.java b/server/src/com/cloud/vm/VirtualMachineProfileImpl.java index c1cf22a8ec3..8c174b0bf25 100644 --- a/server/src/com/cloud/vm/VirtualMachineProfileImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineProfileImpl.java @@ -61,7 +61,8 @@ public class VirtualMachineProfileImpl implements Virtua if (_params == null) { _params = new HashMap(); } - _type = vm.getType(); + if (vm != null) + _type = vm.getType(); } public VirtualMachineProfileImpl(T vm) { @@ -102,7 +103,7 @@ public class VirtualMachineProfileImpl implements Virtua @Override public VirtualMachineTemplate getTemplate() { - if (_template == null) { + if (_template == null && _vm != null) { _template = s_templateDao.findByIdIncludingRemoved(_vm.getTemplateId()); } return _template;