From 05283c7f6dae821570e006e722614eb44a984547 Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Tue, 8 Feb 2011 11:31:33 +0200
Subject: [PATCH] NPE during ES startup when using S3 gateway with the europe
 region specified, closes #659.

---
 .../main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java  | 4 +++-
 .../main/java/org/elasticsearch/cloud/aws/AwsS3Service.java   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/cloud/aws/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java b/plugins/cloud/aws/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java
index 1abe6e29f48..fd7e3e718f5 100644
--- a/plugins/cloud/aws/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java
+++ b/plugins/cloud/aws/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java
@@ -94,7 +94,9 @@ public class AwsEc2Service extends AbstractLifecycleComponent<AwsEc2Service> {
             } else {
                 throw new ElasticSearchIllegalArgumentException("No automatic endpoint could be derived from region [" + region + "]");
             }
-            client.setEndpoint(endpoint);
+            if (endpoint != null) {
+                client.setEndpoint(endpoint);
+            }
         }
 
         return this.client;
diff --git a/plugins/cloud/aws/src/main/java/org/elasticsearch/cloud/aws/AwsS3Service.java b/plugins/cloud/aws/src/main/java/org/elasticsearch/cloud/aws/AwsS3Service.java
index 1eedc92e0a9..2796456d597 100644
--- a/plugins/cloud/aws/src/main/java/org/elasticsearch/cloud/aws/AwsS3Service.java
+++ b/plugins/cloud/aws/src/main/java/org/elasticsearch/cloud/aws/AwsS3Service.java
@@ -94,7 +94,9 @@ public class AwsS3Service extends AbstractLifecycleComponent<AwsS3Service> {
             } else {
                 throw new ElasticSearchIllegalArgumentException("No automatic endpoint could be derived from region [" + region + "]");
             }
-            client.setEndpoint(endpoint);
+            if (endpoint != null) {
+                client.setEndpoint(endpoint);
+            }
         }
 
         return this.client;