[java-support] 02/02: Correctly evaluate HttpClientBuilder timeout values of 0.

[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=73a7cfa374db6f8949cbbdfc6ba820b74922be33

commit 73a7cfa374db6f8949cbbdfc6ba820b74922be33
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Mon Oct 17 18:55:19 2016 -0400

    Correctly evaluate HttpClientBuilder timeout values of 0.
    
    Currently we ignore the setting in 0 value case. This is wrong b/c
    the documents 0 vs -1 as different cases.  We should honor an
    explicit value of 0 (infinite timeout).  Note that -1 is defined
    differently, but in all cases is currently also an infinite timeout.
---
 .../utilities/java/support/httpclient/HttpClientBuilder.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 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 86b65d9..1447b84 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
@@ -984,15 +984,15 @@ public class HttpClientBuilder {
             requestConfigBuilder.setLocalAddress(socketLocalAddress);
         }
 
-        if (socketTimeout > 0) {
+        if (socketTimeout >= 0) {
             requestConfigBuilder.setSocketTimeout(socketTimeout);
         }
 
-        if (connectionTimeout > 0) {
+        if (connectionTimeout >= 0) {
             requestConfigBuilder.setConnectTimeout(connectionTimeout);
         }
         
-        if (connectionRequestTimeout > 0) {
+        if (connectionRequestTimeout >= 0) {
             requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeout);
         }
         

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