diff --git a/ems-core/src/main/java/it/integry/ems/license/LicenseComponent.java b/ems-core/src/main/java/it/integry/ems/license/LicenseComponent.java index b759cc2844..712790bed3 100644 --- a/ems-core/src/main/java/it/integry/ems/license/LicenseComponent.java +++ b/ems-core/src/main/java/it/integry/ems/license/LicenseComponent.java @@ -93,7 +93,7 @@ public class LicenseComponent { String jsonBody = jsonObjectMapper.writeValueAsString(listAziende.values()); StringBuilder responseBody = new StringBuilder(); - int status = HttpRestWrapper.callGeneric(url, "dba", "username", jsonBody, ContentType.APPLICATION_JSON, responseBody, null); + int status = HttpRestWrapper.callGeneric(url, "dba", "username", jsonBody, ContentType.APPLICATION_JSON, responseBody, null, 20); if (status != 200) throw new Exception("La richiesta \"" + url + "\" ha generato status code: " + status + " [" + responseBody + "]"); diff --git a/ems-core/src/main/java/it/integry/ems/service/HttpRestWrapper.java b/ems-core/src/main/java/it/integry/ems/service/HttpRestWrapper.java index 15121d363b..433b76d9cc 100644 --- a/ems-core/src/main/java/it/integry/ems/service/HttpRestWrapper.java +++ b/ems-core/src/main/java/it/integry/ems/service/HttpRestWrapper.java @@ -7,6 +7,7 @@ import it.integry.ems.response.ServiceRestResponse; import it.integry.ems_model.config.EmsRestConstants; import it.integry.ems_model.exception.ExportException; import it.integry.ems_model.exception.InternalRestCallException; +import it.integry.ems_model.utility.UtilityInteger; import it.integry.ems_model.utility.UtilityServer; import it.integry.ems_model.utility.UtilityString; import it.integry.security.utility.RestUtil; @@ -31,6 +32,7 @@ import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.HashMap; import java.util.List; +import java.util.concurrent.TimeUnit; import static org.apache.http.entity.ContentType.APPLICATION_JSON; import static org.apache.http.entity.ContentType.TEXT_PLAIN; @@ -316,8 +318,10 @@ public class HttpRestWrapper { final ClientBuilder builder = ClientBuilder.newBuilder().hostnameVerifier((s, session) -> true) .sslContext(sslContext); -// if (UtilityInteger.isNullOrZero(timeout)) -// builder.connectTimeout(timeout, TimeUnit.SECONDS); + + if (UtilityInteger.isNullOrZero(timeout)) + builder.connectTimeout(timeout, TimeUnit.SECONDS); + return builder.build(); }