From ac08f53d1474882b795e31b903e9236bb11f5542 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Tue, 31 Jan 2012 18:03:43 -0800
Subject: [PATCH] bug 10355: let detachIso failure message be bubbled up

---
 .../cloud/hypervisor/vmware/resource/VmwareResource.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index d4f8a6b33cf..427478ba98d 100755
--- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2389,10 +2389,10 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
                 } else {
                     if (cmd.isAttach()) {
                         vmMo.mountToolsInstaller();
-                    } else {
+                    } else {
                         vmMo.unmountToolsInstaller();
                     }
-
+
                     return new Answer(cmd);
                 }
             }
@@ -2434,8 +2434,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
             } else {
 	            String msg = "AttachIsoCommand(detach) failed due to " + VmwareHelper.getExceptionMessage(e);
 	            s_logger.warn(msg, e);
-	            s_logger.warn("For detachment failure, we will eventually continue on to allow deassociating it from CloudStack DB");
-	            return new Answer(cmd);
+	            return new Answer(cmd, false, msg);
             }
         }
     }