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

Task list getters explicitly check for null now

Browse Source 
Issue: SPR-13680
This commit is contained in:
Juergen Hoeller
2015-11-13 14:25:28 +01:00
parent 4b2ce60d65
commit 55d20557e0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
* @since 4.2
*/
public List<TriggerTask> getTriggerTaskList() {
return Collections.unmodifiableList(this.triggerTasks);
return (this.triggerTasks != null? Collections.unmodifiableList(this.triggerTasks) : null);
}
/**
@@ -159,7 +159,7 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
* @since 4.2
*/
public List<CronTask> getCronTaskList() {
return Collections.unmodifiableList(this.cronTasks);
return (this.cronTasks != null ? Collections.unmodifiableList(this.cronTasks) : null);
}
/**
@@ -188,7 +188,7 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
* @since 4.2
*/
public List<IntervalTask> getFixedRateTaskList() {
return Collections.unmodifiableList(this.fixedRateTasks);
return (this.fixedRateTasks != null ? Collections.unmodifiableList(this.fixedRateTasks) : null);
}
/**
@@ -217,7 +217,7 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
* @since 4.2
*/
public List<IntervalTask> getFixedDelayTaskList() {
return Collections.unmodifiableList(this.fixedDelayTasks);
return (this.fixedDelayTasks != null ? Collections.unmodifiableList(this.fixedDelayTasks) : null);
}
/**