You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2012/07/26 23:05:07 UTC
[37/50] git commit: 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
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
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/576d093e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/576d093e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/576d093e
Branch: refs/heads/rbd
Commit: 576d093e9cf267c01d43f845a715bb2fd685f43f
Parents: 71050bb
Author: Edison Su <su...@gmail.com>
Authored: Tue Jul 24 13:44:55 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Tue Jul 24 13:44:55 2012 -0700
----------------------------------------------------------------------
.../hypervisor/vmware/resource/VmwareResource.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/576d093e/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
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 a8c61f6..685a321 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);