Allon Mureinik has uploaded a new change for review. Change subject: core: ImportVm cleanup: don't iterate map ketSet() ......................................................................
core: ImportVm cleanup: don't iterate map ketSet() Properly iterate over the imported VM's disk map. The main purpose for this change is the added readability, and the (slight) performance gain is just a bonus. Change-Id: I687810d5619603aab135a7d5d8e8fcef11685e9a Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java 1 file changed, 10 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/9616/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 834059d..86fa8f4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -250,9 +250,10 @@ } if (retVal) { Map<Guid, List<DiskImage>> images = getImagesLeaf(getVm().getImages()); - for (Guid id : images.keySet()) { - List<DiskImage> list = images.get(id); - getVm().getDiskMap().put(id, list.get(list.size() - 1)); + for (Map.Entry<Guid, List<DiskImage>> entry : images.entrySet()) { + Guid id = entry.getKey(); + List<DiskImage> diskList = entry.getValue(); + getVm().getDiskMap().put(id, diskList.get(diskList.size() - 1)); } } } else { @@ -586,9 +587,8 @@ if (getParameters().getCopyCollapse()) { Guid snapshotId = Guid.NewGuid(); - for (Guid id : images.keySet()) { - List<DiskImage> list = images.get(id); - DiskImage disk = list.get(list.size() - 1); + for (List<DiskImage> diskList : images.values()) { + DiskImage disk = diskList.get(diskList.size() - 1); disk.setParentId(VmTemplateHandler.BlankVmTemplateId); disk.setit_guid(VmTemplateHandler.BlankVmTemplateId); @@ -607,8 +607,8 @@ if (getParameters().isImportAsNewEntity()) { disk.setId(Guid.NewGuid()); disk.setImageId(Guid.NewGuid()); - for (int i = 0; i < list.size() - 1; i++) { - list.get(i).setId(disk.getId()); + for (int i = 0; i < diskList.size() - 1; i++) { + diskList.get(i).setId(disk.getId()); } } disk.setcreation_date(new Date()); @@ -644,9 +644,8 @@ saveDiskImageDynamic(disk); } - for (Guid id : images.keySet()) { - List<DiskImage> list = images.get(id); - DiskImage disk = list.get(list.size() - 1); + for (List<DiskImage> diskList : images.values()) { + DiskImage disk = diskList.get(diskList.size() - 1); snapshotId = disk.getvm_snapshot_id().getValue(); disk.setactive(true); getImageDao().update(disk.getImage()); -- To view, visit http://gerrit.ovirt.org/9616 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I687810d5619603aab135a7d5d8e8fcef11685e9a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
