You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2006/02/16 21:50:33 UTC
svn commit: r378361 - in /cocoon/branches/BRANCH_2_1_X:
src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
status.xml
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 @@
<release version="@version@" date="@date@">
-->
<release version="2.1.9" date="TBD">
+ <action dev="AG" type="fix" fixes-bug="COCOON-1778" due-to="Eric Meyer" due-to-mail="eric.meyer@quoininc.com">
+ Cron block: NPE calling QuartzJobScheduler.fireJob if the job is a CronJob.
+ </action>
<action dev="JBQ" type="fix">
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