From 4fe386d572136fe9a90f3a1a2b2240fa4e9c44d2 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 24 Feb 2016 17:11:36 +0100 Subject: [PATCH] TimerScheduledFuture correctly calculates getDelay result Issue: SPR-13977 (cherry picked from commit 97b0177) --- .../scheduling/commonj/TimerManagerTaskScheduler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java index 76714ce5f23..81c26787b82 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -126,7 +126,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T } public long getDelay(TimeUnit unit) { - return unit.convert(System.currentTimeMillis() - this.timer.getScheduledExecutionTime(), TimeUnit.MILLISECONDS); + return unit.convert(this.timer.getScheduledExecutionTime() - System.currentTimeMillis(), TimeUnit.MILLISECONDS); } public int compareTo(Delayed other) {