Allon Mureinik has uploaded a new change for review.

Change subject: core: GetAllDisksByVmIdQuery - proper list copying
......................................................................

core: GetAllDisksByVmIdQuery - proper list copying

Create the result list by passing the list from the DAO to the
constructor instead of iterating and calling add(disk).
This way we ensure the list is exactly the right size, and no wasted
memory or redundant regrows occur.

Change-Id: I3402084258aebf3cb9dcfa1d4c494281e95aeeb8
Signed-off-by: Allon Mureinik <[email protected]>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQuery.java
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/15009/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQuery.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQuery.java
index e72f44d..d7dae5b 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQuery.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQuery.java
@@ -24,15 +24,12 @@
                 getDbFacade().getDiskDao().getAllForVm
                         (getParameters().getVmId(), getUserID(), 
getParameters().isFiltered());
         Set<Guid> pluggedDiskIds = getPluggedDiskIds();
-        List<Disk> disks = new ArrayList<Disk>();
+        List<Disk> disks = new ArrayList<Disk>(allDisks);
         for (Disk disk : allDisks) {
             disk.setPlugged(pluggedDiskIds.contains(disk.getId()));
             if (disk.getDiskStorageType() == DiskStorageType.IMAGE) {
                 DiskImage diskImage = (DiskImage) disk;
                 
diskImage.getSnapshots().addAll(getAllImageSnapshots(diskImage));
-                disks.add(disk);
-            } else {
-                disks.add(disk);
             }
         }
         getQueryReturnValue().setReturnValue(disks);


--
To view, visit http://gerrit.ovirt.org/15009
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3402084258aebf3cb9dcfa1d4c494281e95aeeb8
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

Reply via email to