From 3ca22dc55cbc81d472135393cc6bcd0706992280 Mon Sep 17 00:00:00 2001
From: spinnakerbot <spinbot@spinnaker.io>
Date: Fri, 12 Jul 2019 17:22:49 -0400
Subject: [PATCH] fix(appengine): check for null versions in servergroup
 caching agent (#3875) (#3877)

---
 .../provider/agent/AppengineServerGroupCachingAgent.groovy  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/provider/agent/AppengineServerGroupCachingAgent.groovy b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/provider/agent/AppengineServerGroupCachingAgent.groovy
index dbd8abd9801..4de11922a6e 100644
--- a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/provider/agent/AppengineServerGroupCachingAgent.groovy
+++ b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/provider/agent/AppengineServerGroupCachingAgent.groovy
@@ -318,9 +318,11 @@ class AppengineServerGroupCachingAgent extends AbstractAppengineCachingAgent imp
       def callback = new AppengineCallback<ListVersionsResponse>()
         .success { ListVersionsResponse versionsResponse, HttpHeaders responseHeaders ->
           def versions = versionsResponse.getVersions()
-          versions.removeIf { shouldIgnoreServerGroup(it.getId()) }
           if (versions) {
-            serverGroupsByLoadBalancer[loadBalancer].addAll(versions)
+            versions.removeIf { shouldIgnoreServerGroup(it.getId()) }
+            if(versions) {
+              serverGroupsByLoadBalancer[loadBalancer].addAll(versions)
+            }
           }
         }