honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NPE during ES startup when using S3 gateway with the europe region specified, closes #659.

This commit is contained in:
kimchy 2011-02-08 11:31:33 +02:00
parent b8c644cab5
commit 05283c7f6d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/cloud/aws/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java
View File

@ -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;

4
plugins/cloud/aws/src/main/java/org/elasticsearch/cloud/aws/AwsS3Service.java
View File

@ -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;