Liron Aravot has uploaded a new change for review. Change subject: a ......................................................................
a Change-Id: I38b1dbe4ae6a8b9054f1776a35dc59500e9a7b69 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/9453/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java index 1db37b2..2ac8707 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java @@ -125,7 +125,7 @@ // update vms metadata in storage performOvfUpdateIfNeeded(poolId, false); // check if there are any other vms for update. - vms = getVmsForUpdate(vmsIdsForUpdate); + vms.addAll(getVmsForUpdate(vmsIdsForUpdate)); } } @@ -139,7 +139,7 @@ // build templates ovf getTemplatesMetadataDictionary(poolId, templates); performOvfUpdateIfNeeded(poolId, false); - templates = getTemplatesForUpdate(templateIdsForUpdate); + templates.addAll(getTemplatesForUpdate(templateIdsForUpdate)); } } @@ -233,7 +233,7 @@ for (VM vm : vms) { if (VMStatus.ImageLocked != vm.getstatus()) { VmHandler.updateDisksFromDb(vm); - long currentDbGeneration = getVmAndTemplatesGenerationsDAO().getDbGeneration(vm.getId()); + Long currentDbGeneration = getVmAndTemplatesGenerationsDAO().getDbGeneration(vm.getId()); if (vm.getStaticData().getDb_generation() == currentDbGeneration) { boolean verifyDisksNotLocked = verifyDisksNotLocked(vm.getDiskList()); if (verifyDisksNotLocked) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java index dd7f30c..a9ddc6b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java @@ -110,7 +110,7 @@ private boolean stateless; @Column(name = "db_generation") - private long db_generation; + private Long db_generation; @Column(name = "is_smartcard_enabled") private boolean smartcardEnabled; -- To view, visit http://gerrit.ovirt.org/9453 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38b1dbe4ae6a8b9054f1776a35dc59500e9a7b69 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
