Mike Kolesnik has uploaded a new change for review. Change subject: engine: Fix NPE in update network ......................................................................
engine: Fix NPE in update network Clusters field setting was mistakenly removed, putting it back in a form that is not as ugly as it was before, but now update network won't cause NPE :) Change-Id: I9c56912740d8e790bb741cd2a70a7197d5f41be8 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java 1 file changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/10642/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 b94aab7..f9828f2 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 @@ -28,7 +28,7 @@ protected void executeCommand() { getNetworkDAO().update(getNetwork()); - for (VDSGroup cluster : clusters) { + for (VDSGroup cluster : getClusters()) { NetworkClusterHelper.setStatus(cluster.getId(), getNetwork()); } setSucceeded(true); @@ -99,6 +99,14 @@ return super.getValidationGroups(); } + private List<VDSGroup> getClusters() { + if (clusters == null) { + clusters = getVdsGroupDAO().getAllForStoragePool(getStoragePool().getId()); + } + + return clusters; + } + private Network getNetworkById(List<Network> networks) { Guid networkId = getNetwork().getId(); for (Network network : networks) { @@ -114,7 +122,7 @@ ? new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_NOT_EXIST) : ValidationResult.VALID; } - + private ValidationResult networkExists(Network oldNetwork) { return oldNetwork == null ? new ValidationResult(VdcBllMessages.NETWORK_NOT_EXISTS) @@ -144,7 +152,7 @@ private ValidationResult networkNotUsedByRunningVm() { String networkName = getNetworkName(); - for (VDSGroup cluster : getVdsGroupDAO().getAllForStoragePool(getStoragePool().getId())) { + for (VDSGroup cluster : getClusters()) { List<VmStatic> vms = getVmStaticDAO().getAllByGroupAndNetworkName(cluster.getId(), networkName); if (vms.size() > 0) { return new ValidationResult(VdcBllMessages.NETWORK_INTERFACE_IN_USE_BY_VM); -- To view, visit http://gerrit.ovirt.org/10642 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c56912740d8e790bb741cd2a70a7197d5f41be8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
