From c1eaef18c10aa229e60d5742ab1eb9c2d1c38606 Mon Sep 17 00:00:00 2001 From: Abhinandan Prateek Date: Thu, 3 Nov 2011 15:26:54 +0530 Subject: [PATCH] bug 11678: moving initialization to the configure methog --- server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index b89574351dd..94b3e538666 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -237,6 +237,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene protected long _cancelWait; protected long _opWaitInterval; protected int _lockStateRetry; + protected boolean _forceStop; @Override public void registerGuru(VirtualMachine.Type type, VirtualMachineGuru guru) { @@ -420,6 +421,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene ReservationContextImpl.setComponents(_userDao, _domainDao, _accountDao); VirtualMachineProfileImpl.setComponents(_offeringDao, _templateDao, _accountDao); + _forceStop = Boolean.parseBoolean(params.get(Config.VmDestroyForcestop.key())); _cancelWait = NumbersUtil.parseLong(params.get(Config.VmOpCancelInterval.key()), 3600); _cleanupWait = NumbersUtil.parseLong(params.get(Config.VmOpCleanupWait.key()), 3600); _cleanupInterval = NumbersUtil.parseLong(params.get(Config.VmOpCleanupInterval.key()), 86400) * 1000; @@ -1139,9 +1141,8 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene s_logger.debug("Unable to find vm or vm is destroyed: " + vm); } return true; - } - boolean forceStop = Boolean.parseBoolean(_configDao.getValue("vm.destory.forcestop")); - if (!advanceStop(vm, forceStop, user, caller)) { + } + if (!advanceStop(vm, _forceStop, user, caller)) { s_logger.debug("Unable to stop " + vm); return false; }