Merge pull request #2734 from weaveworks/2508-ecs-nil-defence

defend against nils
weaveworks · Jul 20, 2017 · d14acfb · d14acfb
2 parents 0c505ce + d368854
commit d14acfb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/probe/awsecs/client.go b/probe/awsecs/client.go
@@ -240,7 +240,7 @@ func (c ecsClientImpl) getTasks(taskARNs []string) {
 	}
 
 	for _, task := range resp.Tasks {
-		if task.TaskArn != nil {
+		if task != nil && task.TaskArn != nil {
 			c.taskCache.Set(*task.TaskArn, newECSTask(task))
 		}
 	}