TimerScheduledFuture correctly calculates getDelay result

jhoeller · jhoeller · commit 97b017781aa5 · 2016-02-24T17:56:30.000+01:00
Issue: SPR-13977 (cherry picked from commit a68b910)
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
@@ -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.
@@ -134,7 +134,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
 
 		@Override
 		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);
 		}
 
 		@Override

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2012 the original author or authors.`
	`2`	`+ * Copyright 2002-2016 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -134,7 +134,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {`
`134`	`134`
`135`	`135`	`@Override`
`136`	`136`	`public long getDelay(TimeUnit unit) {`
`137`		`- return unit.convert(System.currentTimeMillis() - this.timer.getScheduledExecutionTime(), TimeUnit.MILLISECONDS);`
	`137`	`+ return unit.convert(this.timer.getScheduledExecutionTime() - System.currentTimeMillis(), TimeUnit.MILLISECONDS);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`@Override`