Mike Kolesnik has uploaded a new change for review. Change subject: engine: Refactor MacPoolManager ......................................................................
engine: Refactor MacPoolManager 1. Added private ctor - since this is singleton 2. Moved fields & methods to correct placed. 3. Deleted some commented out code. 4. Removed boolean init to false since this is Java default. Change-Id: I4c9a6e1d806156939c9ac17981eee08aec6f4220 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/10463/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java index c881e40..78d090b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java @@ -24,15 +24,21 @@ private static final int HEX_RADIX = 16; private static final MacPoolManager INSTANCE = new MacPoolManager(); - public static MacPoolManager getInstance() { - return INSTANCE; - } + private static Log log = LogFactory.getLog(MacPoolManager.class); private final Set<String> availableMacs = new HashSet<String>(); private final Set<String> allocatedMacs = new HashSet<String>(); private final Set<String> allocatedCustomMacs = new HashSet<String>(); private final ReentrantReadWriteLock lockObj = new ReentrantReadWriteLock(); - private boolean initialized = false; + private boolean initialized; + + private MacPoolManager() { + // Empty ctor since this is singleton. + } + + public static MacPoolManager getInstance() { + return INSTANCE; + } public void initialize() { lockObj.writeLock().lock(); @@ -97,15 +103,11 @@ long startNum = Long.parseLong(parseRangePart(start), HEX_RADIX); long endNum = Long.parseLong(parseRangePart(end), HEX_RADIX); if (startNum > endNum) { - // throw new - // VdcBLLException(VdcBllErrors.MAC_POOL_INITIALIZATION_FAILED); return false; } for (long i = startNum; i <= endNum; i++) { String value = String.format("%x", i); if (value.length() > 12) { - // throw new - // VdcBLLException(VdcBllErrors.MAC_POOL_INITIALIZATION_FAILED); return false; } else if (value.length() < 12) { value = StringUtils.leftPad(value, 12, '0'); @@ -245,8 +247,6 @@ lockObj.writeLock().unlock(); } } - - private static Log log = LogFactory.getLog(MacPoolManager.class); @SuppressWarnings("serial") private class MacPoolExceededMaxException extends RuntimeException { -- To view, visit http://gerrit.ovirt.org/10463 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c9a6e1d806156939c9ac17981eee08aec6f4220 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
