From 0aa24c9ebfad62e3438c3b707df301a6bf6fcbc8 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Tue, 28 Dec 2010 12:06:24 -0800
Subject: [PATCH] bug 7686: when detach iso, always remove is from uservm table
 to make sure ISO is remove after stop/start

status 7686: resolved fixed
---
 .../com/cloud/template/TemplateManagerImpl.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index ac80bd74ba5..c47530039e3 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1253,16 +1253,17 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe
     	} else {
     		startEventId = EventUtils.saveStartedEvent(userId, vm.getAccountId(), EventTypes.EVENT_ISO_DETACH, "Detaching ISO: "+isoId+" from Vm: "+vmId, startEventId);
     	}
+
         boolean success = _vmMgr.attachISOToVM(vmId, isoId, attach);
-
+        
+        if (attach) {
+            vm.setIsoId(iso.getId());
+        } else {
+            vm.setIsoId(null);
+        }
+        _userVmDao.update(vmId, vm);
+        
         if (success) {
-            if (attach) {
-                vm.setIsoId(iso.getId());
-            } else {
-                vm.setIsoId(null);
-            }
-            _userVmDao.update(vmId, vm);
-
             if (attach) {
             	EventUtils.saveEvent(userId, vm.getAccountId(), EventVO.LEVEL_INFO, EventTypes.EVENT_ISO_ATTACH, "Successfully attached ISO: " + iso.getName() + " to VM with ID: " + vmId,
                         null, startEventId);