Merge pull request #2515 from weaveworks/2508-avoid-null-derreference…

…s-encore Avoid null dereferences in ECS client (encore)
weaveworks · May 10, 2017 · ec6d5e9 · ec6d5e9
2 parents 9d89e8b + aec7156
commit ec6d5e9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/probe/awsecs/client.go b/probe/awsecs/client.go
@@ -209,7 +209,9 @@ func (c ecsClientImpl) describeServicesBatch(names []string) {
 	}
 
 	for _, service := range resp.Services {
-		c.serviceCache.Set(*service.ServiceName, newECSService(service))
+		if service != nil {
+			c.serviceCache.Set(*service.ServiceName, newECSService(service))
+		}
 	}
 }