From 55d20557e078a00071873753779f8f669d9b4b79 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Fri, 13 Nov 2015 14:25:28 +0100
Subject: [PATCH] Task list getters explicitly check for null now

Issue: SPR-13680
---
 .../scheduling/config/ScheduledTaskRegistrar.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
index e3dde1e3d6..681d975c42 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
@@ -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);
 	}
 
 	/**
-- 
GitLab