mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Do not set endpoint if it is an empty string 

Also do not pass along endpoint as an override if we set it via the
builder.  Fixes #229.
pull/239/head
Andrew Gaul 2017-07-08 19:44:30 -07:00
rodzic 23705a879b
commit 17294be152
1 zmienionych plików z 2 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
src/main/java/org/gaul/s3proxy/Main.java
Wyświetl plik

@ -272,6 +272,7 @@ public final class Main {
String credential = properties.getProperty( String credential = properties.getProperty(
Constants.PROPERTY_CREDENTIAL); Constants.PROPERTY_CREDENTIAL);
String endpoint = properties.getProperty(Constants.PROPERTY_ENDPOINT); String endpoint = properties.getProperty(Constants.PROPERTY_ENDPOINT);
properties.remove(Constants.PROPERTY_ENDPOINT);
String region = properties.getProperty( String region = properties.getProperty(
LocationConstants.PROPERTY_REGION); LocationConstants.PROPERTY_REGION);
@ -306,7 +307,7 @@ public final class Main {
.credentials(identity, credential) .credentials(identity, credential)
.modules(ImmutableList.<Module>of(new SLF4JLoggingModule())) .modules(ImmutableList.<Module>of(new SLF4JLoggingModule()))
.overrides(properties); .overrides(properties);
if (endpoint != null) { if (!Strings.isNullOrEmpty(endpoint)) {
builder = builder.endpoint(endpoint); builder = builder.endpoint(endpoint);
} }