From commits-return-36169-archive-asf-public=cust-asf.ponee.io@karaf.apache.org Tue Apr 16 06:52:17 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 486B6180630 for ; Tue, 16 Apr 2019 08:52:17 +0200 (CEST) Received: (qmail 90042 invoked by uid 500); 16 Apr 2019 06:52:16 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 90023 invoked by uid 99); 16 Apr 2019 06:52:16 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Apr 2019 06:52:16 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 646038A070; Tue, 16 Apr 2019 06:52:16 +0000 (UTC) Date: Tue, 16 Apr 2019 06:52:16 +0000 To: "commits@karaf.apache.org" Subject: [karaf] branch master updated: [KARAF-6237] Fix reschedule action in the scheduler MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155539753600.20721.9149455111926507871@gitbox.apache.org> From: jbonofre@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: karaf X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: de0e531d7d3676756e83c80e2870d270d6bae880 X-Git-Newrev: aae23a9deb7fe6137290d29147f9e71e83dd0a51 X-Git-Rev: aae23a9deb7fe6137290d29147f9e71e83dd0a51 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/karaf.git The following commit(s) were added to refs/heads/master by this push: new aae23a9 [KARAF-6237] Fix reschedule action in the scheduler new 2a32c32 Merge pull request #813 from jbonofre/KARAF-6237 aae23a9 is described below commit aae23a9deb7fe6137290d29147f9e71e83dd0a51 Author: Jean-Baptiste Onofré AuthorDate: Mon Apr 15 15:32:07 2019 +0200 [KARAF-6237] Fix reschedule action in the scheduler --- .../karaf/scheduler/core/QuartzScheduler.java | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java b/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java index 0a743b6..b9eb680 100644 --- a/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java +++ b/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java @@ -54,7 +54,7 @@ public class QuartzScheduler implements Scheduler { static final String DATA_MAP_OPTIONS = "QuartzJobScheduler.Options"; /** Map key for non serializable context. */ - static final String DATA_MAP_CONTEXT = "QuarteJobScheduler.Context"; + static final String DATA_MAP_CONTEXT = "QuartzJobScheduler.Context"; /** Map key for the logger. */ static final String DATA_MAP_LOGGER = "QuartzJobScheduler.Logger"; @@ -246,28 +246,30 @@ public class QuartzScheduler implements Scheduler { } @Override - public void reschedule(String name, ScheduleOptions options) throws SchedulerError { + public void reschedule(String jobName, ScheduleOptions options) throws SchedulerError { final org.quartz.Scheduler s = this.scheduler; - if (name == null) { + if (jobName == null) { throw new IllegalArgumentException("Job name is mandatory"); } - JobKey key = JobKey.jobKey(name); + JobKey key = JobKey.jobKey(jobName); if (key == null) { - throw new IllegalStateException("No job found with name " + name); + throw new IllegalStateException("No job found with name " + jobName); } try { JobDetail detail = s.getJobDetail(key); - Object job = detail.getJobDataMap().get(DATA_MAP_OBJECT); + final String contextKey = key.toString(); + JobDataMap karafContext = ((KarafStdScheduler) s).getStorage().get(contextKey); + Object job = karafContext.get(QuartzScheduler.DATA_MAP_OBJECT); s.deleteJob(key); final InternalScheduleOptions opts = (InternalScheduleOptions)options; - Trigger trigger = opts.compile().withIdentity(name).build(); - JobDataMap jobDataMap = this.initDataMap(name, job, opts); - detail = createJobDetail(name, jobDataMap, opts.canRunConcurrently); + Trigger trigger = opts.compile().withIdentity(jobName).build(); + JobDataMap jobDataMap = this.initDataMap(jobName, job, opts); + detail = createJobDetail(jobName, jobDataMap, opts.canRunConcurrently); - logger.debug("Update job scheduling {} with name {} and trigger {}", job, name, trigger); + logger.debug("Update job scheduling {} with name {} and trigger {}", job, jobName, trigger); s.scheduleJob(detail, trigger); } catch (SchedulerException e) { throw new SchedulerError(e);