Skip to content
Snippets Groups Projects
Commit 1739fc30 authored by Xavier Gibert's avatar Xavier Gibert
Browse files

SSL timeout bugfix

parent 917dba8d
Branches
Tags STAVOR_v1.2.1
No related merge requests found
...@@ -26,6 +26,9 @@ import ch.boye.httpclientandroidlib.conn.ssl.SSLConnectionSocketFactory; ...@@ -26,6 +26,9 @@ import ch.boye.httpclientandroidlib.conn.ssl.SSLConnectionSocketFactory;
import ch.boye.httpclientandroidlib.impl.client.CloseableHttpClient; import ch.boye.httpclientandroidlib.impl.client.CloseableHttpClient;
import ch.boye.httpclientandroidlib.impl.client.HttpClients; import ch.boye.httpclientandroidlib.impl.client.HttpClients;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.orekit.propagation.SpacecraftState; import org.orekit.propagation.SpacecraftState;
import cs.si.stavor.R; import cs.si.stavor.R;
...@@ -130,10 +133,15 @@ public class ThreadRemote extends Thread{ ...@@ -130,10 +133,15 @@ public class ThreadRemote extends Thread{
.build(); .build();
RequestConfig requestConfig = RequestConfig.custom() RequestConfig requestConfig = RequestConfig.custom()
.setConnectionRequestTimeout(Parameters.Simulator.Remote.remote_connection_timeout_ms)
.setSocketTimeout(Parameters.Simulator.Remote.remote_connection_timeout_ms) .setSocketTimeout(Parameters.Simulator.Remote.remote_connection_timeout_ms)
.setConnectTimeout(Parameters.Simulator.Remote.remote_connection_timeout_ms) .setConnectTimeout(Parameters.Simulator.Remote.remote_connection_timeout_ms)
.build(); .build();
final HttpParams httpParams = new BasicHttpParams();
HttpConnectionParams.setSoTimeout(httpParams, Parameters.Simulator.Remote.remote_connection_timeout_ms);
HttpConnectionParams.setConnectionTimeout(httpParams, Parameters.Simulator.Remote.remote_connection_timeout_ms);
// GET request to execute // GET request to execute
/*get = new HttpGet( /*get = new HttpGet(
"https://192.168.43.10:8443/OrekitWebServer/StavorServlet");*/ "https://192.168.43.10:8443/OrekitWebServer/StavorServlet");*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment