Merge branch '6.0.x'

sbrannen · sbrannen · commit 1058fed33937 · 2023-07-15T18:24:00.000+02:00
diff --git a/spring-context/src/main/java/org/springframework/scheduling/Trigger.java b/spring-context/src/main/java/org/springframework/scheduling/Trigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -45,7 +45,7 @@ public interface Trigger {
 	@Nullable
 	default Date nextExecutionTime(TriggerContext triggerContext) {
 		Instant instant = nextExecution(triggerContext);
-		return instant != null ? Date.from(instant) : null;
+		return (instant != null ? Date.from(instant) : null);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2022 the original author or authors.`
	`2`	`+ * Copyright 2002-2023 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.`
`@@ -45,7 +45,7 @@ public interface Trigger {`
`45`	`45`	`@Nullable`
`46`	`46`	`default Date nextExecutionTime(TriggerContext triggerContext) {`
`47`	`47`	`Instant instant = nextExecution(triggerContext);`
`48`		`- return instant != null ? Date.from(instant) : null;`
	`48`	`+ return (instant != null ? Date.from(instant) : null);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`