Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Objects;
import java.util.TimeZone;

import org.jspecify.annotations.Nullable;
Expand Down Expand Up @@ -145,12 +146,13 @@ Instant determineInitialTimestamp(TriggerContext triggerContext) {
@Override
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof CronTrigger that &&
this.expression.equals(that.expression)));
this.expression.equals(that.expression) &&
Objects.equals(this.zoneId, that.zoneId)));
}

@Override
public int hashCode() {
return this.expression.hashCode();
return Objects.hash(this.expression, this.zoneId);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.scheduling.support;

import java.time.ZoneId;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
Expand Down Expand Up @@ -746,6 +747,16 @@ void daylightSavingMissingHour() {
assertThat(nextExecutionTime).isEqualTo(this.calendar.getTime());
}

@Test
void equalsAndHashCodeConsiderZoneId() {
String cron = "0 0 9 * * *";
CronTrigger amsterdam = new CronTrigger(cron, ZoneId.of("Europe/Amsterdam"));
CronTrigger newYork = new CronTrigger(cron, ZoneId.of("America/New_York"));

assertThat(amsterdam).isNotEqualTo(newYork);
assertThat(amsterdam).doesNotHaveSameHashCodeAs(newYork);
}


private static void roundup(Calendar calendar) {
calendar.add(Calendar.SECOND, 1);
Expand Down