Extra null check for paranoia.

arunk054 · Jun 8, 2015 · fe695a5 · fe695a5
1 parent 1b76035
commit fe695a5
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/eureka-core/src/main/java/com/netflix/eureka/util/AwsAsgUtil.java b/eureka-core/src/main/java/com/netflix/eureka/util/AwsAsgUtil.java
@@ -20,7 +20,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.services.securitytoken.AWSSecurityTokenService;
 import com.amazonaws.services.securitytoken.AWSSecurityTokenServiceClient;
 import com.amazonaws.services.securitytoken.model.AssumeRoleResult;
@@ -154,7 +153,7 @@ public void setStatus(String asgName, boolean enabled) {
     private boolean isAddToLoadBalancerSuspended(String asgName) {
         String asgAccount = getASGAccount(asgName);
         AutoScalingGroup asg;
-        if(asgAccount.equals(accountId)) {
+        if(asgAccount == null || asgAccount.equals(accountId)) {
             asg = retrieveAutoScalingGroup(asgName);
         } else {
             asg = retrieveAutoScalingGroupCrossAccount(asgAccount, asgName);