Lior Vernia has uploaded a new change for review. Change subject: webadmin: Small logic fix when reassigning roles ......................................................................
webadmin: Small logic fix when reassigning roles Previous fix implicitly relied on the state of the sent entity too much, now comparison is made with the entity as stored in the DB. Change-Id: I99bceea9f35f2356897a21c6e6e7f2f051f3f37d Bug-Url: https://bugzilla.redhat.com/1135785 Signed-off-by: Lior Vernia <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/32925/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java index d1cee0a..83a8d6a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java @@ -50,15 +50,16 @@ } public void removeNetworkAndReassignRoles() { + NetworkCluster oldNetworkCluster = getNetworkClusterDao().get(networkCluster.getId()); getNetworkClusterDao().remove(networkCluster.getClusterId(), networkCluster.getNetworkId()); boolean updateManagementNetwork = false; - if (networkCluster.isDisplay()) { + if (oldNetworkCluster.isDisplay()) { getManagementNetworkCluster().setDisplay(true); updateManagementNetwork = true; } - if (networkCluster.isMigration()) { + if (oldNetworkCluster.isMigration()) { getManagementNetworkCluster().setMigration(true); updateManagementNetwork = true; } -- To view, visit http://gerrit.ovirt.org/32925 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I99bceea9f35f2356897a21c6e6e7f2f051f3f37d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
