Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Iteration on a SynchronizedSet must be manually synchronized (default mutex is the collection instance itself).

Browse Source
This commit is contained in:
Mark Fisher
2008-09-24 17:28:47 +00:00
parent eee8352093
commit 26834f88f8
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
org.springframework.integration/src/main/java/org/springframework/integration/scheduling/SimpleTaskScheduler.java
View File

@@ -112,15 +112,17 @@ public class SimpleTaskScheduler implements TaskScheduler {
if (!this.running) {
return;
}
this.running = false;
Thread executingThread = this.schedulerTask.executingThread.getAndSet(null);
if (executingThread != null) {
executingThread.interrupt();
}
for (TriggeredTask<?> task : this.executingTasks) {
task.cancel(true);
synchronized (this.executingTasks) {
for (TriggeredTask<?> task : this.executingTasks) {
task.cancel(true);
}
this.executingTasks.clear();
}
this.executingTasks.clear();
this.running = false;
}
finally {
this.lifecycleLock.unlock();
@@ -148,7 +150,9 @@ public class SimpleTaskScheduler implements TaskScheduler {
while (SimpleTaskScheduler.this.isRunning()) {
try {
TriggeredTask<?> task = SimpleTaskScheduler.this.scheduledTasks.take();
SimpleTaskScheduler.this.executor.execute(task);
if (SimpleTaskScheduler.this.isRunning()) {
SimpleTaskScheduler.this.executor.execute(task);
}
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
@@ -183,7 +187,7 @@ public class SimpleTaskScheduler implements TaskScheduler {
SimpleTaskScheduler.this.executingTasks.add(this);
super.runAndReset();
SimpleTaskScheduler.this.executingTasks.remove(this);
if (isRunning() && !isCancelled()) {
if (SimpleTaskScheduler.this.isRunning() && !this.isCancelled()) {
SimpleTaskScheduler.this.schedule(this, this.scheduledTime, new Date());
}
}
@@ -207,7 +211,7 @@ public class SimpleTaskScheduler implements TaskScheduler {
}
public synchronized boolean cancel(boolean mayInterruptIfRunning) {
if (!isCancelled()) {
if (!this.isCancelled()) {
SimpleTaskScheduler.this.scheduledTasks.remove(this);
}
return super.cancel(mayInterruptIfRunning);