root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Sam Brannen 2023-07-15 18:24:00 +02:00
parent bcd09d7ad8 544f594592
commit 1058fed339
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/main/java/org/springframework/scheduling/Trigger.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -45,7 +45,7 @@ public interface Trigger {
@Nullable @Nullable
default Date nextExecutionTime(TriggerContext triggerContext) { default Date nextExecutionTime(TriggerContext triggerContext) {
Instant instant = nextExecution(triggerContext); Instant instant = nextExecution(triggerContext);
return instant != null ? Date.from(instant) : null; return (instant != null ? Date.from(instant) : null);
} }
/** /**