root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

SchedulerFactoryBean supports non-durable jobs when accompanied by a trigger 

Issue: SPR-11689
This commit is contained in:
Juergen Hoeller 2014-04-15 15:24:49 +02:00
parent 397aa82984
commit 9a59292603
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java
View File

@ -289,19 +289,29 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware {
*/ */
private boolean addTriggerToScheduler(Trigger trigger) throws SchedulerException { private boolean addTriggerToScheduler(Trigger trigger) throws SchedulerException {
boolean triggerExists = (getScheduler().getTrigger(trigger.getKey()) != null); boolean triggerExists = (getScheduler().getTrigger(trigger.getKey()) != null);
if (!triggerExists || this.overwriteExistingJobs) { if (triggerExists && !this.overwriteExistingJobs) {
return false;
}
// Check if the Trigger is aware of an associated JobDetail. // Check if the Trigger is aware of an associated JobDetail.
JobDetail jobDetail = (JobDetail) trigger.getJobDataMap().remove("jobDetail"); JobDetail jobDetail = (JobDetail) trigger.getJobDataMap().remove("jobDetail");
if (jobDetail != null) { if (triggerExists) {
// Automatically register the JobDetail too. if (jobDetail != null && !this.jobDetails.contains(jobDetail) && addJobToScheduler(jobDetail)) {
if (!this.jobDetails.contains(jobDetail) && addJobToScheduler(jobDetail)) {
this.jobDetails.add(jobDetail); this.jobDetails.add(jobDetail);
} }
getScheduler().rescheduleJob(trigger.getKey(), trigger);
} }
if (!triggerExists) { else {
try { try {
if (jobDetail != null && !this.jobDetails.contains(jobDetail) &&
(this.overwriteExistingJobs || getScheduler().getJobDetail(jobDetail.getKey()) == null)) {
getScheduler().scheduleJob(jobDetail, trigger);
this.jobDetails.add(jobDetail);
}
else {
getScheduler().scheduleJob(trigger); getScheduler().scheduleJob(trigger);
} }
}
catch (ObjectAlreadyExistsException ex) { catch (ObjectAlreadyExistsException ex) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Unexpectedly found existing trigger, assumably due to cluster race condition: " + logger.debug("Unexpectedly found existing trigger, assumably due to cluster race condition: " +
@ -312,15 +322,8 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware {
} }
} }
} }
else {
getScheduler().rescheduleJob(trigger.getKey(), trigger);
}
return true; return true;
} }
else {
return false;
}
}
/** /**
* Register all specified listeners with the Scheduler. * Register all specified listeners with the Scheduler.