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

Calling cancel on a Future returned by a TaskScheduler works reliably now 

Issue: SPR-9821
This commit is contained in:
Juergen Hoeller 2012-09-25 12:06:43 +02:00
parent ef9d35c473
commit e0bec678da
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
spring-context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2012 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -49,9 +49,9 @@ class ReschedulingRunnable extends DelegatingErrorHandlingRunnable implements Sc
private final ScheduledExecutorService executor; private final ScheduledExecutorService executor;
private volatile ScheduledFuture currentFuture; private ScheduledFuture currentFuture;
private volatile Date scheduledExecutionTime; private Date scheduledExecutionTime;
private final Object triggerContextMonitor = new Object(); private final Object triggerContextMonitor = new Object();
@ -82,35 +82,47 @@ class ReschedulingRunnable extends DelegatingErrorHandlingRunnable implements Sc
Date completionTime = new Date(); Date completionTime = new Date();
synchronized (this.triggerContextMonitor) { synchronized (this.triggerContextMonitor) {
this.triggerContext.update(this.scheduledExecutionTime, actualExecutionTime, completionTime); this.triggerContext.update(this.scheduledExecutionTime, actualExecutionTime, completionTime);
} if (!this.currentFuture.isCancelled()) {
if (!this.currentFuture.isCancelled()) { schedule();
schedule(); }
} }
} }
public boolean cancel(boolean mayInterruptIfRunning) { public boolean cancel(boolean mayInterruptIfRunning) {
return this.currentFuture.cancel(mayInterruptIfRunning); synchronized (this.triggerContextMonitor) {
return this.currentFuture.cancel(mayInterruptIfRunning);
}
} }
public boolean isCancelled() { public boolean isCancelled() {
return this.currentFuture.isCancelled(); synchronized (this.triggerContextMonitor) {
return this.currentFuture.isCancelled();
}
} }
public boolean isDone() { public boolean isDone() {
return this.currentFuture.isDone(); synchronized (this.triggerContextMonitor) {
return this.currentFuture.isDone();
}
} }
public Object get() throws InterruptedException, ExecutionException { public Object get() throws InterruptedException, ExecutionException {
return this.currentFuture.get(); synchronized (this.triggerContextMonitor) {
return this.currentFuture.get();
}
} }
public Object get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { public Object get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
return this.currentFuture.get(timeout, unit); synchronized (this.triggerContextMonitor) {
return this.currentFuture.get(timeout, unit);
}
} }
public long getDelay(TimeUnit unit) { public long getDelay(TimeUnit unit) {
return this.currentFuture.getDelay(unit); synchronized (this.triggerContextMonitor) {
return this.currentFuture.getDelay(unit);
}
} }
public int compareTo(Delayed other) { public int compareTo(Delayed other) {