Martin Mucha has uploaded a new change for review.
Change subject: core: wrong nesting: not detecting label & VmNetwork changes
......................................................................
core: wrong nesting: not detecting label & VmNetwork changes
this equality checks are badly nested causing the last two lines does
not do what intended. Instead
oldNetwork.isVmNetwork()
is compared to
newNetwork.isVmNetwork()) && Objects.equals(oldNetwork.getLabel(),
newNetwork.getLabel());
which wasn't probably wanted.
Change-Id: I50c748071e09fb062ce08aedd1af71db6c4e280d
Signed-off-by: Martin Mucha <mmu...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/32658/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
index 1c0baf2..cab3fb5 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
@@ -159,8 +159,8 @@
Objects.equals(oldNetwork.getProvidedBy(),
newNetwork.getProvidedBy()) &&
Objects.equals(oldNetwork.getStp(), newNetwork.getStp()) &&
Objects.equals(oldNetwork.getVlanId(), newNetwork.getVlanId())
&&
- Objects.equals(oldNetwork.isVmNetwork(),
newNetwork.isVmNetwork() &&
- Objects.equals(oldNetwork.getLabel(), newNetwork.getLabel()));
+ Objects.equals(oldNetwork.isVmNetwork(),
newNetwork.isVmNetwork()) &&
+ Objects.equals(oldNetwork.getLabel(), newNetwork.getLabel());
}
private boolean oldAndNewNetworkIsNotExternal() {
--
To view, visit http://gerrit.ovirt.org/32658
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50c748071e09fb062ce08aedd1af71db6c4e280d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Mucha <mmu...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
