From 67f76b519253d528b0a53df7dffc4c12d508e06f Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 11 Jul 2011 17:26:28 -0700
Subject: [PATCH] Do regular vm stop (not forced=true) when disableAccount

---
 server/src/com/cloud/user/AccountManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index dab1b8cd2d7..b04c85f7e92 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -1187,7 +1187,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
         for (VMInstanceVO vm : vms) {
             try {
                 try {
-                    success = (success && _itMgr.advanceStop(vm, true, getSystemUser(), getSystemAccount()));
+                    success = (success && _itMgr.advanceStop(vm, false, getSystemUser(), getSystemAccount()));
                 } catch (OperationTimedoutException ote) {
                     s_logger.warn("Operation for stopping vm timed out, unable to stop vm " + vm.getHostName(), ote);
                     success = false;