From 0216cef7bd51ba82b3bae94883399a529a19de9e Mon Sep 17 00:00:00 2001
From: Alexander Kazakov <alexshadow007@gmail.com>
Date: Tue, 31 May 2016 18:01:49 +0200
Subject: [PATCH] Fix EC2 discovery setting

Closes #18652
---
 .../java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java
index 649f84b7aed..5c7e6653f52 100644
--- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java
+++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java
@@ -114,7 +114,7 @@ public class AwsEc2ServiceImpl extends AbstractLifecycleComponent implements Aws
 
         AWSCredentialsProvider credentials;
 
-        if (key == null && secret == null) {
+        if (key.isEmpty() && secret.isEmpty()) {
             credentials = new AWSCredentialsProviderChain(
                     new EnvironmentVariableCredentialsProvider(),
                     new SystemPropertiesCredentialsProvider(),