sgoeschl 2005/03/31 03:50:57
Modified: quartz/src/java/org/apache/fulcrum/quartz/impl
DefaultQuartzScheduler.java
Log:
Not registering a ServiceableJobListener results in a NPE in the dispose()
method. We now check that the ServiceableJobListener is indeed instantiated
before we deregister it
Revision Changes Path
1.3 +11 -9
jakarta-turbine-fulcrum/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java
Index: DefaultQuartzScheduler.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultQuartzScheduler.java 3 Nov 2004 18:02:18 -0000 1.2
+++ DefaultQuartzScheduler.java 31 Mar 2005 11:50:57 -0000 1.3
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,11 +51,11 @@
/**
* Default implementation of QuartzScheduler
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Leandro Rodrigo Saad Cruz
* </a>
* @author <a href="mailto:[EMAIL PROTECTED]">Eric Pugh </a>
- *
+ *
*/
public class DefaultQuartzScheduler implements QuartzScheduler,
Configurable, Serviceable, Disposable, Initializable,
ThreadSafe {
@@ -163,14 +163,14 @@
CronTrigger triggerToSchedule = new
CronTrigger(trigger.getName(),trigger.getGroup(),trigger.getJobName(),trigger.getJobGroup(),((CronTrigger)trigger).getCronExpression());
logger.debug("Scheduling trigger [" +
triggerToSchedule.getFullName() + "] for job ["
+ triggerToSchedule.getFullJobName() + "] using
cron " + triggerToSchedule.getCronExpression());
-
+
triggerToSchedule.setDescription(trigger.getDescription());
// CronTrigger cronTrigger = new
CronTrigger("someTriggerCron", Scheduler.DEFAULT_GROUP,
// "simpleJob","DEFAULT_GROUP" ,"* * * * * ?");
scheduler.scheduleJob(triggerToSchedule);
/* Trigger rightNow = new SimpleTrigger("someTrigger",
Scheduler.DEFAULT_GROUP,
"notSoSimpleJob","DEFAULT_GROUP" ,new Date(),
null, 0,0L);
-
+
scheduler.scheduleJob(rightNow);*/
}
}
@@ -189,7 +189,9 @@
} catch (SchedulerException e) {
logger.warn("Problem shuting down scheduler ", e);
}
- wrapper.dispose();
+ if(wrapper != null) {
+ wrapper.dispose();
+ }
scheduler = null;
manager = null;
}
@@ -210,7 +212,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see
br.com.ibnetwork.xingu.quartzscheduler.QuartzScheduler#getTriggersMap()
*/
public Map getTriggersMap() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
