Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refined CronSequenceGenerator's rounding up of seconds to address second-specific cron expressions

Browse Source 
Issue: SPR-9459
This commit is contained in:
Juergen Hoeller
2013-02-08 21:13:04 +01:00
parent 89c3d03083
commit af8e6255e2
3 changed files with 72 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
View File

@@ -71,7 +71,19 @@ public class CronSequenceGenerator {
/**
* Construct a {@link CronSequenceGenerator} from the pattern provided.
* Construct a {@link CronSequenceGenerator} from the pattern provided,
* using the default {@link TimeZone}.
* @param expression a space-separated list of time fields
* @throws IllegalArgumentException if the pattern cannot be parsed
* @see java.util.TimeZone#getDefault()
*/
public CronSequenceGenerator(String expression) {
this(expression, TimeZone.getDefault());
}
/**
* Construct a {@link CronSequenceGenerator} from the pattern provided,
* using the specified {@link TimeZone}.
* @param expression a space-separated list of time fields
* @param timeZone the TimeZone to use for generated trigger times
* @throws IllegalArgumentException if the pattern cannot be parsed
@@ -114,12 +126,17 @@ public class CronSequenceGenerator {
calendar.setTimeZone(this.timeZone);
calendar.setTime(date);
// Truncate to the next whole second
calendar.add(Calendar.SECOND, 1);
// First, just reset the milliseconds and try to calculate from there...
calendar.set(Calendar.MILLISECOND, 0);
long originalTimestamp = calendar.getTimeInMillis();
doNext(calendar, calendar.get(Calendar.YEAR));
if (calendar.getTimeInMillis() == originalTimestamp) {
// We arrived at the original timestamp - round up to the next whole second and try again...
calendar.add(Calendar.SECOND, 1);
doNext(calendar, calendar.get(Calendar.YEAR));
}
return calendar.getTime();
}