Kanagaraj M has uploaded a new change for review. Change subject: gluster: compare GlusterAsyncTask in equals of Entities ......................................................................
gluster: compare GlusterAsyncTask in equals of Entities Added GlusterAsyncTask comparison to GlusterVolumeEntity's and GlusterBrickEntity's equals method. Change-Id: If85362b23057532ba69fe2b9f6d0e9c5d5753e2b Bug-Url: https://bugzilla.redhat.com/1025013 Signed-off-by: Kanagaraj M <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/21077/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java index 771aefd..df93add 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java @@ -132,6 +132,7 @@ && (ObjectUtils.objectsEqual(serverId, brick.getServerId())) && (ObjectUtils.objectsEqual(brickDirectory, brick.getBrickDirectory())) && (ObjectUtils.objectsEqual(brickOrder, brick.getBrickOrder())) + && (ObjectUtils.objectsEqual(getAsyncTask(), brick.getAsyncTask())) && status == brick.getStatus()); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java index 9ef32b9..02488c3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java @@ -412,6 +412,10 @@ return false; } + if (!ObjectUtils.objectsEqual(getAsyncTask(), volume.getAsyncTask())) { + return false; + } + return true; } -- To view, visit http://gerrit.ovirt.org/21077 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If85362b23057532ba69fe2b9f6d0e9c5d5753e2b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
