Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 90459 invoked from network); 16 Feb 2006 20:50:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Feb 2006 20:50:58 -0000 Received: (qmail 57104 invoked by uid 500); 16 Feb 2006 20:50:57 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 57060 invoked by uid 500); 16 Feb 2006 20:50:56 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 57049 invoked by uid 99); 16 Feb 2006 20:50:56 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2006 12:50:56 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 16 Feb 2006 12:50:54 -0800 Received: (qmail 90096 invoked by uid 65534); 16 Feb 2006 20:50:34 -0000 Message-ID: <20060216205034.90095.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r378361 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java status.xml Date: Thu, 16 Feb 2006 20:50:33 -0000 To: cvs@cocoon.apache.org From: antonio@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: antonio Date: Thu Feb 16 12:50:32 2006 New Revision: 378361 URL: http://svn.apache.org/viewcvs?rev=378361&view=rev Log: Fix COCOON-1778 - NPE calling QuartzJobScheduler.fireJob if the job is a CronJob. Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java cocoon/branches/BRANCH_2_1_X/status.xml Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java?rev=378361&r1=378360&r2=378361&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java Thu Feb 16 12:50:32 2006 @@ -697,21 +697,22 @@ */ private boolean fireJob(final String name, final Object job) { try { - if (job instanceof CronJob) { + if (job instanceof CronJob || job instanceof Job) { JobDataMap jobDataMap = new JobDataMap(); jobDataMap.put(DATA_MAP_OBJECT, job); initDataMap(jobDataMap, name, true, null, null); final JobDetail detail = createJobDetail(name, jobDataMap); - TriggerFiredBundle trigger = new TriggerFiredBundle(detail, null, null, false, null, null, null, null); + final Trigger trigger = new SimpleTrigger(name, DEFAULT_QUARTZ_JOB_GROUP); + + TriggerFiredBundle fireBundle = new TriggerFiredBundle(detail, trigger, null, false, null, null, null, null); final Job executor = createJobExecutor(); - final JobExecutionContext context = new JobExecutionContext(this.scheduler, trigger, executor); + final JobExecutionContext context = new JobExecutionContext(this.scheduler, fireBundle, executor); this.executor.execute(new Runnable() { public void run() { - // ((CronJob)job).execute(name); try { executor.execute(context); } catch (JobExecutionException e) { Modified: cocoon/branches/BRANCH_2_1_X/status.xml URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=378361&r1=378360&r2=378361&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/status.xml (original) +++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Feb 16 12:50:32 2006 @@ -180,6 +180,9 @@ --> + + Cron block: NPE calling QuartzJobScheduler.fireJob if the job is a CronJob. + In cocoon.sh, use shell built-in command "exec" to replace sh's process instead of forking a new process for executing the "java" command, useful