diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-01-10 14:18:57 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-01-10 14:30:34 +0100 |
| commit | 0185e8a039281a1e12bab3c8c20399b75a0798f9 (patch) | |
| tree | e334197f2d614165b0144400d04fbe99723cb172 /controller-server | |
| parent | 3e4b51c07bf72cb35e67dbb8b63c274ada397861 (diff) | |
Upgrade Apache httpclient+httpcore to newest version
Use deprecated setSslcontext() in code that may run
outside JDisc.
Diffstat (limited to 'controller-server')
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java index dd43195f67d..95867b3786c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java @@ -213,7 +213,7 @@ public class ConfigServerRestExecutorImpl extends AbstractComponent implements C HostnameVerifier hostnameVerifier) { return HttpClientBuilder.create() .setUserAgent("config-server-proxy-client") - .setSslcontext(sslContextProvider.getIdentitySslContext()) + .setSSLContext(sslContextProvider.getIdentitySslContext()) .setSSLHostnameVerifier(hostnameVerifier) .setDefaultRequestConfig(config) .setMaxConnPerRoute(10) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/FlagsClient.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/FlagsClient.java index b22c9e44a2b..5cd6b32d572 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/FlagsClient.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/FlagsClient.java @@ -87,7 +87,7 @@ class FlagsClient { return HttpClientBuilder.create() .setUserAgent("controller-flags-v1-client") .setRetryHandler(new DefaultHttpRequestRetryHandler(5, /*retry on non-idempotent requests*/true)) - .setSslcontext(identityProvider.getIdentitySslContext()) + .setSSLContext(identityProvider.getIdentitySslContext()) .setSSLHostnameVerifier(new FlagTargetsHostnameVerifier(targets)) .setDefaultRequestConfig(RequestConfig.custom() .setConnectTimeout((int) Duration.ofSeconds(10).toMillis()) |