Re-using existing method
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7f4fe859 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7f4fe859 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7f4fe859 Branch: refs/heads/master Commit: 7f4fe859e4f9dfff28f50fe4f83e09814a213f24 Parents: f19d557 Author: Francesco Chicchiriccò <[email protected]> Authored: Mon Aug 22 17:16:47 2016 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Mon Aug 22 17:16:47 2016 +0200 ---------------------------------------------------------------------- .../syncope/core/logic/init/JobManagerImpl.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/7f4fe859/core/logic/src/main/java/org/apache/syncope/core/logic/init/JobManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/init/JobManagerImpl.java b/core/logic/src/main/java/org/apache/syncope/core/logic/init/JobManagerImpl.java index dec65f5..25d232d 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/init/JobManagerImpl.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/init/JobManagerImpl.java @@ -142,21 +142,9 @@ public class JobManagerImpl implements JobManager, SyncopeLoader { final Map<String, Object> jobMap) throws SchedulerException { - synchronized (scheduler.getScheduler()) { - boolean jobAlreadyRunning = false; - for (JobExecutionContext jobCtx : scheduler.getScheduler().getCurrentlyExecutingJobs()) { - if (jobName.equals(jobCtx.getJobDetail().getKey().getName()) - && Scheduler.DEFAULT_GROUP.equals(jobCtx.getJobDetail().getKey().getGroup())) { - - jobAlreadyRunning = true; - - LOG.debug("Job {} already running, cancel", jobCtx.getJobDetail().getKey()); - } - } - - if (jobAlreadyRunning) { - return; - } + if (isRunningHere(new JobKey(jobName, Scheduler.DEFAULT_GROUP))) { + LOG.debug("Job {} already running, cancel", jobName); + return; } // 0. unregister job
