Merge remote-tracking branch 'origin/5.2.x' into 6.0.x

This commit is contained in:
William Cheng
2021-03-30 13:18:35 +08:00
1103 changed files with 7928 additions and 9209 deletions

View File

@@ -1063,10 +1063,8 @@ public class ApiClient extends JavaTimeFormatter {
* @return Client
*/
protected Client buildHttpClient() {
// use the default client config if not yet initialized
if (clientConfig == null) {
clientConfig = getDefaultClientConfig();
}
// recreate the client config to pickup changes
clientConfig = getDefaultClientConfig();
ClientBuilder clientBuilder = ClientBuilder.newBuilder();
customizeClientBuilder(clientBuilder);