Alona Kaplan has uploaded a new change for review. Change subject: wedamdin: NPE when removing label from interface/bond ......................................................................
wedamdin: NPE when removing label from interface/bond When removing label from a nic with no 'network labels' attached to it there was NPE. Added safe check to fix this issue. Change-Id: I18619a212503731586c68dc414e51ae12e52fefa Bug-Url: https://bugzilla.redhat.com/1063762 Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java 1 file changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/25458/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index 104d798..83b9952 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -124,7 +124,7 @@ private Map<String, LogicalNetworkModel> networkMap; - private Map<String, NetworkLabelModel> labelMap; + private Map<String, NetworkLabelModel> networkLabelMap; private Map<String, String> labelToIface; @@ -265,13 +265,14 @@ Set<LogicalNetworkModel> removedNetworks = new HashSet<LogicalNetworkModel>(); Set<LogicalNetworkModel> addedNetworks = new HashSet<LogicalNetworkModel>(); for (String label : removedLabels) { - Collection<LogicalNetworkModel> labelNetworks = labelMap.get(label).getNetworks(); + NetworkLabelModel networkLabelModel = networkLabelMap.get(label); + Collection<LogicalNetworkModel> labelNetworks = networkLabelModel != null ? networkLabelModel.getNetworks() : null; if (labelNetworks != null) { removedNetworks.addAll(labelNetworks); } } for (String label : addedLabels) { - NetworkLabelModel labelModel = labelMap.get(label); + NetworkLabelModel labelModel = networkLabelMap.get(label); if (labelModel != null) { addedNetworks.addAll(labelModel.getNetworks()); } @@ -605,16 +606,16 @@ private void initNetworkModels() { Map<String, LogicalNetworkModel> networkModels = new HashMap<String, LogicalNetworkModel>(); - labelMap = new HashMap<String, NetworkLabelModel>(); + networkLabelMap = new HashMap<String, NetworkLabelModel>(); for (Network network : allNetworks) { LogicalNetworkModel networkModel = new LogicalNetworkModel(network, this); networkModels.put(network.getName(), networkModel); if (!network.isExternal()) { - NetworkLabelModel labelModel = labelMap.get(network.getLabel()); + NetworkLabelModel labelModel = networkLabelMap.get(network.getLabel()); if (labelModel == null) { labelModel = new NetworkLabelModel(network.getLabel(), this); - labelMap.put(network.getLabel(), labelModel); + networkLabelMap.put(network.getLabel(), labelModel); } labelModel.getNetworks().add(networkModel); } @@ -713,7 +714,7 @@ if (labels != null) { for (String label : labels) { labelToIface.put(label, ifName); - NetworkLabelModel labelModel = labelMap.get(label); + NetworkLabelModel labelModel = networkLabelMap.get(label); if (labelModel != null) { // attach label networks to nic for (LogicalNetworkModel networkModel : labelModel.getNetworks()) { -- To view, visit http://gerrit.ovirt.org/25458 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I18619a212503731586c68dc414e51ae12e52fefa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4.0 Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
