[java-support] branch master updated: JSPT-66: Investigate actual vs documented behavior of various HttpClient timeouts

[Brent Putman]

This is an automated email from the git hooks/post-receive script.

putmanb pushed a commit to branch master
in repository java-support.

View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=7918bc7a0ab88cc880e2567fe31cf266d9ddeb26

The following commit(s) were added to refs/heads/master by this push:
       new  7918bc7   JSPT-66: Investigate actual vs documented behavior of various HttpClient timeouts
7918bc7 is described below

commit 7918bc7a0ab88cc880e2567fe31cf266d9ddeb26
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Tue Oct 18 18:25:59 2016 -0400

    JSPT-66: Investigate actual vs documented behavior of various HttpClient
    timeouts
    
    Change timeout values from (effectively) infinite to 60 seconds.
---
 .../utilities/java/support/httpclient/HttpClientBuilder.java | 12 ++++++------
 .../java/support/httpclient/HttpClientBuilderTest.java       |  9 +++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
index bd05413..b45f0f2 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
@@ -146,7 +146,7 @@ public class HttpClientBuilder {
     private InetAddress socketLocalAddress;
 
     /**
-     * Maximum period inactivity between two consecutive data packets in milliseconds. Default value: 5000 (5 seconds)
+     * Maximum period inactivity between two consecutive data packets in milliseconds. Default value: 60000 (60 seconds)
      */
     private int socketTimeout;
 
@@ -154,14 +154,14 @@ public class HttpClientBuilder {
     private int socketBufferSize;
 
     /**
-     * Maximum length of time in milliseconds to wait for the connection to be established. Default value: 5000 (5
+     * Maximum length of time in milliseconds to wait for the connection to be established. Default value: 60000 (60
      * seconds)
      */
     private int connectionTimeout;
     
     /**
      * Maximum length of time in milliseconds to wait for a connection to be returned from the connection
-     * manager. Default value: TBD;
+     * manager. Default value: 60000 (60 seconds);
      */
     private int connectionRequestTimeout;
     
@@ -275,9 +275,9 @@ public class HttpClientBuilder {
         maxConnectionsPerRoute = -1;
         socketLocalAddress = null;
         socketBufferSize = 8192;
-        socketTimeout = -1;
-        connectionTimeout = -1;
-        connectionRequestTimeout = -1;
+        socketTimeout = 60*1000;
+        connectionTimeout = 60*1000;
+        connectionRequestTimeout = 60*1000;
         connectionDisregardTLSCertificate = false;
         connectionCloseAfterResponse = true;
         connectionStaleCheck = false;
diff --git a/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilderTest.java b/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilderTest.java
index eb4283a..34cdfd2 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilderTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilderTest.java
@@ -24,13 +24,14 @@ import org.testng.annotations.Test;
 
 public class HttpClientBuilderTest {
     
-    // Don't impose default timeouts
-    @Test public void JSPT48() throws Exception {
+    // Default timeouts
+    @Test public void JSPT66() throws Exception {
         final HttpClientBuilder builder = new HttpClientBuilder();
         
         // Check the defaults at the builder level
-        Assert.assertEquals(builder.getConnectionTimeout(), -1);
-        Assert.assertEquals(builder.getSocketTimeout(), -1);
+        Assert.assertEquals(builder.getConnectionTimeout(), 60000);
+        Assert.assertEquals(builder.getSocketTimeout(), 60000);
+        Assert.assertEquals(builder.getConnectionRequestTimeout(), 60000);
         
         // Just make sure we can create a client, too
         final HttpClient client = builder.buildClient();

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.