Arik Hadas has uploaded a new change for review. Change subject: core: remove redundant synchronization #2 ......................................................................
core: remove redundant synchronization #2 Change-Id: I588de14e21f19ef59781b382b2450b8723635667 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java 1 file changed, 4 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/29522/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java index 3d8afaf..815ca54 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java @@ -36,12 +36,11 @@ private final CommandCoordinator coco; private final Map<Guid, CommandCallBack> cmdCallBackMap = new ConcurrentHashMap<>(); - private Object LOCK = new Object(); - private volatile boolean cmdExecutorInitialized; CommandExecutor(CommandCoordinator coco) { this.coco = coco; SchedulerUtil scheduler = SchedulerUtilQuartzImpl.getInstance(); + initCommandExecutor(); scheduler.scheduleAFixedDelayJob(this, "invokeCallbackMethods", new Class[]{}, new Object[]{}, Config.<Integer>getValue(ConfigValues.AsyncCommandPollingRateInSeconds), Config.<Integer>getValue(ConfigValues.AsyncCommandPollingRateInSeconds), TimeUnit.SECONDS); @@ -49,7 +48,6 @@ @OnTimerMethodAnnotation("invokeCallbackMethods") public void invokeCallbackMethods() { - initCommandExecutor(); for (Iterator<Entry<Guid, CommandCallBack>> iterator = cmdCallBackMap.entrySet().iterator(); iterator.hasNext();) { Entry<Guid, CommandCallBack> entry = iterator.next(); Guid cmdId = entry.getKey(); @@ -81,16 +79,9 @@ } private void initCommandExecutor() { - if (!cmdExecutorInitialized) { - synchronized(LOCK) { - if (!cmdExecutorInitialized) { - for (CommandEntity cmdEntity : coco.getCommandsWithCallBackEnabled()) { - if (!cmdEntity.isCallBackNotified()) { - addToCallBackMap(cmdEntity); - } - } - cmdExecutorInitialized = true; - } + for (CommandEntity cmdEntity : coco.getCommandsWithCallBackEnabled()) { + if (!cmdEntity.isCallBackNotified()) { + addToCallBackMap(cmdEntity); } } } -- To view, visit http://gerrit.ovirt.org/29522 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I588de14e21f19ef59781b382b2450b8723635667 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
