Jakub Niedermertl has uploaded a new change for review. Change subject: core: VmBase equals() & hashCode() fix - Vm Icons ......................................................................
core: VmBase equals() & hashCode() fix - Vm Icons Vm Icons related fields added to equals() and hashCode() methods of VmBase. Change-Id: I7f18e07beef49d3b684d019fee84d9493bd4f98d Bug-Url: https://bugzilla.redhat.com/1103175 Signed-off-by: Jakub Niedermertl <jnied...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/19/40319/3 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 0dece69..9a3d941 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 @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import javax.validation.constraints.Min; import javax.validation.constraints.Pattern; @@ -939,6 +940,8 @@ result = prime * result + ((userDefinedProperties == null) ? 0 : userDefinedProperties.hashCode()); result = prime * result + ((customEmulatedMachine == null) ? 0 : customEmulatedMachine.hashCode()); result = prime * result + ((customCpuName== null) ? 0 : customCpuName.hashCode()); + result = prime * result + ((smallIconId == null) ? 0 : smallIconId.hashCode()); + result = prime * result + ((largeIconId == null) ? 0 : largeIconId.hashCode()); return result; } @@ -1002,7 +1005,9 @@ && ObjectUtils.objectsEqual(predefinedProperties, other.predefinedProperties) && ObjectUtils.objectsEqual(userDefinedProperties, other.userDefinedProperties) && ObjectUtils.objectsEqual(customEmulatedMachine, other.customEmulatedMachine) - && ObjectUtils.objectsEqual(customCpuName, other.customCpuName); + && ObjectUtils.objectsEqual(customCpuName, other.customCpuName) + && Objects.equals(smallIconId, other.smallIconId) + && Objects.equals(largeIconId, other.largeIconId); } public Guid getQuotaId() { -- To view, visit https://gerrit.ovirt.org/40319 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f18e07beef49d3b684d019fee84d9493bd4f98d Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Jakub Niedermertl <jnied...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
