From eec9f5f6f6bbbdb62e533c3ba456b438113b3e60 Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 11 Jan 2011 17:10:35 -0800 Subject: [PATCH] A minor fix to take into account stopping of a vm in stopping state. We will get a concurrentmodificationexception, and end in errorinmaintenance. This behavior is consistent with how stop works for cpvm. --- server/src/com/cloud/storage/StorageManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 84651834cb3..97992cd6ac0 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -2188,7 +2188,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag } //shut down the running vms - if(vmInstance.getState().equals(State.Running) || vmInstance.getState().equals(State.Starting)) + if(vmInstance.getState().equals(State.Running) || vmInstance.getState().equals(State.Starting) || vmInstance.getState().equals(State.Stopping)) { //if the instance is of type consoleproxy, call the console proxy