From 3c05679a978f085fbad5556e2a4ee5b6c6cf7e85 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 30 Jun 2023 14:04:37 +0200 Subject: [PATCH] Polishing See gh-30762 --- .../scheduling/concurrent/ConcurrentTaskScheduler.java | 5 ++--- .../scheduling/concurrent/ThreadPoolTaskScheduler.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java index eb2f29a4c88..9b3e65b33ff 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java @@ -212,10 +212,9 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T @Override public ScheduledFuture schedule(Runnable task, Instant startTime) { - Duration initialDelay = Duration.between(this.clock.instant(), startTime); + Duration delay = Duration.between(this.clock.instant(), startTime); try { - return this.scheduledExecutor.schedule(decorateTask(task, false), - NANO.convert(initialDelay), NANO); + return this.scheduledExecutor.schedule(decorateTask(task, false), NANO.convert(delay), NANO); } catch (RejectedExecutionException ex) { throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex); diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java index bffdc53bef8..bad07b6ee86 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java @@ -383,10 +383,9 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport @Override public ScheduledFuture schedule(Runnable task, Instant startTime) { ScheduledExecutorService executor = getScheduledExecutor(); - Duration initialDelay = Duration.between(this.clock.instant(), startTime); + Duration delay = Duration.between(this.clock.instant(), startTime); try { - return executor.schedule(errorHandlingTask(task, false), - NANO.convert(initialDelay), NANO); + return executor.schedule(errorHandlingTask(task, false), NANO.convert(delay), NANO); } catch (RejectedExecutionException ex) { throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);