From cf7f8d9f66516e4b49616e19907499799e3f8418 Mon Sep 17 00:00:00 2001
From: spinnakerbot <spinbot@spinnaker.io>
Date: Mon, 2 Mar 2020 14:07:58 -0500
Subject: [PATCH] fix(ecs): Prevent NPE when a task def ARN is no longer in the
 cache (#4338) (#4361)

Co-authored-by: Clare Liguori <liguori@amazon.com>
Co-authored-by: Eric Zimanyi <ezimanyi@google.com>
---
 .../ecs/provider/agent/TaskDefinitionCachingAgent.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCachingAgent.java b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCachingAgent.java
index bd604cb98cd..d390fc76aeb 100644
--- a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCachingAgent.java
+++ b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCachingAgent.java
@@ -149,7 +149,9 @@ private Set<TaskDefinition> retrieveFromCache(
     for (String taskDefArn : taskDefArns) {
       String key = Keys.getTaskDefinitionKey(accountName, region, taskDefArn);
       TaskDefinition taskDefinition = taskDefinitionCacheClient.get(key);
-      taskDefs.add(taskDefinition);
+      if (taskDefinition != null) {
+        taskDefs.add(taskDefinition);
+      }
     }
 
     return taskDefs;