Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-04-17 17:45:21 +02:00
parent ff6a882db0 63fb64ed06
commit 5c7ea38f1f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-core/src/main/java/it/integry/ems/license/LicenseComponent.java
View File

@@ -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 + "]");

8
ems-core/src/main/java/it/integry/ems/service/HttpRestWrapper.java
View File

@@ -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();
}