[HtmlUnit] SVN: [9234] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/ HttpWebConnection.java

[<rb...@us...>]

Revision: 9234
          http://sourceforge.net/p/htmlunit/code/9234
Author:   rbri
Date:     2014-04-06 12:35:00 +0000 (Sun, 06 Apr 2014)
Log Message:
-----------
code cleanup

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java	2014-04-05 18:12:41 UTC (rev 9233)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java	2014-04-06 12:35:00 UTC (rev 9234)
@@ -224,7 +224,7 @@
 
     private void setProxy(final HttpRequestBase httpRequest, final WebRequest webRequest) {
         final RequestConfig.Builder requestBuilder = createRequestConfig();
-        configureTimeout(requestBuilder, webClient_.getOptions().getTimeout());
+        configureTimeout(requestBuilder, getTimeout());
 
         if (webRequest.getProxyHost() != null) {
             final HttpHost proxy = new HttpHost(webRequest.getProxyHost(), webRequest.getProxyPort());
@@ -550,7 +550,7 @@
                         && response.getFirstHeader("location") != null;
             }
         });
-        configureTimeout(builder, webClient_.getOptions().getTimeout());
+        configureTimeout(builder, getTimeout());
         builder.setMaxConnPerRoute(6);
         return builder;
     }
@@ -590,8 +590,9 @@
             configureHttpsScheme(httpClientBuilder);
         }
 
-        if (options.getTimeout() != usedOptions_.getTimeout()) {
-            configureTimeout(httpClientBuilder, options.getTimeout());
+        final int timeout = getTimeout();
+        if (timeout != usedOptions_.getTimeout()) {
+            configureTimeout(httpClientBuilder, timeout);
         }
         return httpClientBuilder;
     }