Skip to content
This repository has been archived by the owner on May 7, 2020. It is now read-only.

[astro] Tidy up set of scheduled futures #3811

Merged
merged 1 commit into from Jul 7, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -16,6 +16,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -278,6 +279,7 @@ public void schedule(Job job, Calendar eventAt) {
long sleepTime;
monitor.lock();
try {
tidyScheduledFutures();
sleepTime = eventAt.getTimeInMillis() - new Date().getTime();
ScheduledFuture<?> future = scheduler.schedule(job, sleepTime, TimeUnit.MILLISECONDS);
scheduledFutures.add(future);
Expand All @@ -290,6 +292,16 @@ public void schedule(Job job, Calendar eventAt) {
}
}

private void tidyScheduledFutures() {
for (Iterator<ScheduledFuture<?>> iterator = scheduledFutures.iterator(); iterator.hasNext();) {
ScheduledFuture<?> future = iterator.next();
if (future.isDone()) {
logger.trace("Tidying up done future {}", future);
iterator.remove();
}
}
}

/**
* Calculates and publishes the daily Astro data.
*/
Expand Down