fix CS-15432 Failed to detach VMware tools ISO after VMware tools

sudison · sudison · commit 576d093e9cf2 · 2012-07-24T13:44:55.000-07:00
installation RB: https://reviews.apache.org/r/5738/ Send-by: mice_xia@tcloudcomputing.com
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2465,7 +2465,11 @@ protected Answer execute(AttachIsoCommand cmd) {
                     if (cmd.isAttach()) {
                         vmMo.mountToolsInstaller();
                     } else {
-                        vmMo.unmountToolsInstaller();
+                        try{
+                            vmMo.unmountToolsInstaller();
+                        }catch(Throwable e){
+                            vmMo.detachIso(null);
+                        }
                     }
 
                     return new Answer(cmd);
