Skip to content

Commit 55d2055

Browse files
committed
Task list getters explicitly check for null now
Issue: SPR-13680
1 parent 4b2ce60 commit 55d2055

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public void setTriggerTasksList(List<TriggerTask> triggerTasks) {
130130
* @since 4.2
131131
*/
132132
public List<TriggerTask> getTriggerTaskList() {
133-
return Collections.unmodifiableList(this.triggerTasks);
133+
return (this.triggerTasks != null? Collections.unmodifiableList(this.triggerTasks) : null);
134134
}
135135

136136
/**
@@ -159,7 +159,7 @@ public void setCronTasksList(List<CronTask> cronTasks) {
159159
* @since 4.2
160160
*/
161161
public List<CronTask> getCronTaskList() {
162-
return Collections.unmodifiableList(this.cronTasks);
162+
return (this.cronTasks != null ? Collections.unmodifiableList(this.cronTasks) : null);
163163
}
164164

165165
/**
@@ -188,7 +188,7 @@ public void setFixedRateTasksList(List<IntervalTask> fixedRateTasks) {
188188
* @since 4.2
189189
*/
190190
public List<IntervalTask> getFixedRateTaskList() {
191-
return Collections.unmodifiableList(this.fixedRateTasks);
191+
return (this.fixedRateTasks != null ? Collections.unmodifiableList(this.fixedRateTasks) : null);
192192
}
193193

194194
/**
@@ -217,7 +217,7 @@ public void setFixedDelayTasksList(List<IntervalTask> fixedDelayTasks) {
217217
* @since 4.2
218218
*/
219219
public List<IntervalTask> getFixedDelayTaskList() {
220-
return Collections.unmodifiableList(this.fixedDelayTasks);
220+
return (this.fixedDelayTasks != null ? Collections.unmodifiableList(this.fixedDelayTasks) : null);
221221
}
222222

223223
/**

0 commit comments

Comments
 (0)