From cdd51061b5d0a40549dfeaf3e00557ae545fdbcf Mon Sep 17 00:00:00 2001 From: lgangloff Date: Wed, 21 Oct 2015 16:26:27 +0200 Subject: [PATCH] https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/issues/838 --- .../jwt/signer/service/impl/JWKSetCacheService.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetCacheService.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetCacheService.java index 81abdd2f0..12d9a0c6d 100644 --- a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetCacheService.java +++ b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetCacheService.java @@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.SystemDefaultHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.mitre.jose.keystore.JWKSetKeyStore; import org.mitre.jwt.encryption.service.JwtEncryptionAndDecryptionService; import org.mitre.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; @@ -105,7 +105,9 @@ public class JWKSetCacheService { * */ private class JWKSetVerifierFetcher extends CacheLoader { - private HttpClient httpClient = new SystemDefaultHttpClient(); + private HttpClient httpClient = HttpClientBuilder.create() + .useSystemProperties() + .build(); private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); private RestTemplate restTemplate = new RestTemplate(httpFactory); @@ -133,7 +135,9 @@ public class JWKSetCacheService { * */ private class JWKSetEncryptorFetcher extends CacheLoader { - private HttpClient httpClient = new SystemDefaultHttpClient(); + private HttpClient httpClient = HttpClientBuilder.create() + .useSystemProperties() + .build(); private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); private RestTemplate restTemplate = new RestTemplate(httpFactory); /* (non-Javadoc)