You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2014/01/08 14:17:10 UTC

git commit: updated refs/heads/master to 00e67f5

Updated Branches:
  refs/heads/master 777ab1494 -> 00e67f57e


CLOUDSTACK-5827: [Automation] Destroy VM failed, while deleting account

Signed-off-by: Koushik Das <ko...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/00e67f57
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/00e67f57
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/00e67f57

Branch: refs/heads/master
Commit: 00e67f57e7c5354a36a664f38ad72e3481dabdec
Parents: 777ab14
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Wed Jan 8 15:10:23 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Wed Jan 8 18:38:59 2014 +0530

----------------------------------------------------------------------
 .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java   | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00e67f57/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index cd4e327..a81fea8 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -459,6 +459,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         }
 
         advanceStop(vm.getUuid(), false);
+        vm = _vmDao.findByUuid(vm.getUuid());
 
         try {
             if (!stateTransitTo(vm, VirtualMachine.Event.ExpungeOperation, vm.getHostId())) {