etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x

This commit is contained in:
Deepti Dohare 2012-07-05 11:32:24 +05:30
parent 7d6db010ac 922d254b72
commit 892ee23ca5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -1815,13 +1815,13 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
}
}
}
else if(info == null && vm.getState() == State.Stopping) { //Handling CS-13376
/* else if(info == null && vm.getState() == State.Stopping) { //Handling CS-13376
s_logger.warn("Marking the VM as Stopped as it was still stopping on the CS" +vm.getName());
vm.setState(State.Stopped); // Setting the VM as stopped on the DB and clearing it from the host
vm.setLastHostId(vm.getHostId());
vm.setHostId(null);
_vmDao.persist(vm);
}
}*/
}
for (final AgentVmInfo left : infos.values()) {