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:07:55 UTC

git commit: updated refs/heads/4.3 to c3e6444

Updated Branches:
  refs/heads/4.3 f15c8d22e -> c3e6444ad


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/c3e6444a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c3e6444a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c3e6444a

Branch: refs/heads/4.3
Commit: c3e6444adfe6d8a640cf6e50b3d2637af74253d5
Parents: f15c8d2
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:29:58 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/c3e6444a/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 f959b93..17f0936 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -457,6 +457,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())) {