From 576d093e9cf267c01d43f845a715bb2fd685f43f Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Tue, 24 Jul 2012 13:44:55 -0700
Subject: [PATCH] fix CS-15432 Failed to detach VMware tools ISO after VMware
 tools installation RB: https://reviews.apache.org/r/5738/ Send-by:
 mice_xia@tcloudcomputing.com

---
 .../cloud/hypervisor/vmware/resource/VmwareResource.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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
index a8c61f6fad8..685a321bcca 100755
--- 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 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
                     if (cmd.isAttach()) {
                         vmMo.mountToolsInstaller();
                     } else {
-                        vmMo.unmountToolsInstaller();
+                        try{
+                            vmMo.unmountToolsInstaller();
+                        }catch(Throwable e){
+                            vmMo.detachIso(null);
+                        }
                     }
 
                     return new Answer(cmd);