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

fixed ConcurrentModificationException

This commit is contained in:
anthony 2011-01-21 11:23:51 -08:00
parent cfb51ece25
commit dce0ab6190
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -740,7 +740,9 @@ public abstract class CitrixResourceBase implements ServerResource {
if (vmSpec.getBootloader() == BootloaderType.CD) {
vm.setPVBootloader(conn, "eliloader");
Map<String, String> otherConfig = vm.getOtherConfig(conn);
otherConfig.put( "install-repository", "cdrom");
if ( ! vm.getOtherConfig(conn).containsKey("install-repository") ) {
otherConfig.put( "install-repository", "cdrom");
}
vm.setOtherConfig(conn, otherConfig);
} else if (vmSpec.getBootloader() == BootloaderType.PyGrub ){
vm.setPVBootloader(conn, "pygrub");
@ -2655,7 +2657,9 @@ public abstract class CitrixResourceBase implements ServerResource {
try {
Set<VM> vms = VM.getByNameLabel(conn, vmName);
// stop vm which is running on this host or is in halted state
for (VM vm : vms) {
Iterator<VM> iter = vms.iterator();
while ( iter.hasNext() ) {
VM vm = iter.next();
VM.Record vmr = vm.getRecord(conn);
if (vmr.powerState != VmPowerState.RUNNING) {
continue;
@ -2666,7 +2670,7 @@ public abstract class CitrixResourceBase implements ServerResource {
if (vmr.residentOn.getUuid(conn).equals(_host.uuid)) {
continue;
}
vms.remove(vm);
iter.remove();
}
if (vms.size() == 0) {