You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2013/07/23 01:14:10 UTC
git commit: updated refs/heads/master to 3d05fb0
Updated Branches:
refs/heads/master 7f59d6c9e -> 3d05fb0b3
throw exception if stopping VM fails, then UI can show the error message in stead of fails silently
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d05fb0b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d05fb0b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d05fb0b
Branch: refs/heads/master
Commit: 3d05fb0b3e76ee5254892c014372b005926c74b6
Parents: 7f59d6c
Author: Anthony Xu <an...@citrix.com>
Authored: Mon Jul 22 16:12:44 2013 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Mon Jul 22 16:14:01 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d05fb0b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 88faea0..7edd7d2 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1270,8 +1270,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
} catch (AgentUnavailableException e) {
s_logger.warn("Unable to stop vm, agent unavailable: " + e.toString());
+ throw e;
} catch (OperationTimedoutException e) {
s_logger.warn("Unable to stop vm, operation timed out: " + e.toString());
+ throw e;
} finally {
if (!stopped) {
if (!forced) {