Mike Kolesnik has uploaded a new change for review. Change subject: engine: Fix MAC pool initalization ......................................................................
engine: Fix MAC pool initalization Template NICs have no MAC address, so need to avoid null addresses. Since this code will be replaced soon, just added check that MAC is not null. Change-Id: If318029b6ae16a8b02a135afd641d3fd0955cbaf Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/28894/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java index f119cfb..243941e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java @@ -49,7 +49,9 @@ List<VmNic> interfaces = getVmNicInterfacesFromDb(); for (VmNic iface : interfaces) { - forceAddMacWithoutLocking(iface.getMacAddress()); + if (iface.getMacAddress() != null) { + forceAddMacWithoutLocking(iface.getMacAddress()); + } } initialized = true; log.infoFormat("Finished initializing. Available MACs in pool: {0}", macsStorage.getAvailableMacsCount()); -- To view, visit http://gerrit.ovirt.org/28894 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If318029b6ae16a8b02a135afd641d3fd0955cbaf 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
