TimerScheduledFuture correctly calculates getDelay result

jhoeller · jhoeller · commit 4fe386d57213 · 2016-04-08T22:30:56.000+02:00
Issue: SPR-13977 (cherry picked from commit 97b0177)
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.
@@ -126,7 +126,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
 		}
 
 		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) {

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.`
`@@ -126,7 +126,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`public long getDelay(TimeUnit unit) {`
`129`		`- return unit.convert(System.currentTimeMillis() - this.timer.getScheduledExecutionTime(), TimeUnit.MILLISECONDS);`
	`129`	`+ return unit.convert(this.timer.getScheduledExecutionTime() - System.currentTimeMillis(), TimeUnit.MILLISECONDS);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`public int compareTo(Delayed other) {`