From d46d1da86c6f2a31afadfc3cf0fb517fe584eb14 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 28 Jun 2011 14:27:42 +0530 Subject: [PATCH] bug 10455: accidentally removed the code for sourceTemplate id when the the volume is created out of template. Checking it in. status 10455: resolved fixed --- server/src/com/cloud/vm/UserVmManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 98c66db10a2..4c2a0b34c9c 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -1399,7 +1399,9 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager if (volume != null) { VMTemplateVO template = ApiDBUtils.findTemplateById(volume.getTemplateId()); isExtractable = template != null && template.isExtractable() && template.getTemplateType() != Storage.TemplateType.SYSTEM; - if (template == null && volume.getVolumeType() == Type.ROOT){ //vm created out of blank template + if (template != null){ + sourceTemplateId = template.getId(); + }else if (volume.getVolumeType() == Type.ROOT){ //vm created out of blank template UserVm userVm = ApiDBUtils.findUserVmById(volume.getInstanceId()); sourceTemplateId = userVm.getIsoId(); }