Skip to content

Commit f359dca

Browse files
authored
don't do compare if endpoint is empty
1 parent 2ff5827 commit f359dca

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

extension/httpfs/s3fs.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,10 @@ S3AuthParams S3AuthParams::ReadFrom(optional_ptr<FileOpener> opener, FileOpenerI
196196
}
197197
}
198198

199-
if (result.endpoint.empty()) {
200-
result.endpoint = "s3.amazonaws.com";
201-
}
202-
203-
if (result.endpoint == "s3.amazonaws.com" && !result.region.empty()) {
204-
result.endpoint = StringUtil::Format("s3.%s.amazonaws.com", result.region);
199+
if (!result.region.empty() && (result.endpoint.empty() || result.endpoint == "s3.amazonaws.com")) {
200+
result.endpoint = StringUtil::Format("s3.%s.amazonaws.com", result.region);
201+
} else if (result.endpoint.empty()) {
202+
result.endpoint = "s3.amazonaws.com";
205203
}
206204

207205
return result;

0 commit comments

Comments
 (0)