Merge "Fix timeout issue when cert service is unavailable"

diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpClientProvider.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpClientProvider.java
index ff29a14..5ad933f 100644 (file)
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpClientProvider.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpClientProvider.java
@@ -34,7 +34,11 @@ public class CloseableHttpClientProvider {
 
     public CloseableHttpClient getClient() {
         RequestConfig config =
-                RequestConfig.custom().setConnectionRequestTimeout(timeout).build();
+                RequestConfig.custom()
+                        .setConnectionRequestTimeout(timeout)
+                        .setConnectTimeout(timeout)
+                        .setSocketTimeout(timeout)
+                        .build();
         return HttpClientBuilder.create().setDefaultRequestConfig(config).build();
     }
 }