[Geotools-commits] svn - r38440 - branches/2.7.x/modules/library/main/src/main/java/org/geotools/data/ows

[<svn...@os...>]

Author: groldan
Date: 2011-12-20 20:51:54 -0800 (Tue, 20 Dec 2011)
New Revision: 38440

Modified:
   branches/2.7.x/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java
Log:
Make SimpleHttpClient respect the set connection and read timeouts. It was assuming millisecond while the properties are set in seconds

Modified: branches/2.7.x/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java
===================================================================
--- branches/2.7.x/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java	2011-12-21 03:58:42 UTC (rev 38439)
+++ branches/2.7.x/modules/library/main/src/main/java/org/geotools/data/ows/SimpleHttpClient.java	2011-12-21 04:51:54 UTC (rev 38440)
@@ -34,7 +34,7 @@
  */
 public class SimpleHttpClient implements HTTPClient {
 
-    private static final int DEFAULT_TIMEOUT = 30000;// 30 seconds
+    private static final int DEFAULT_TIMEOUT = 30;// 30 seconds
 
     private String user;
 
@@ -131,8 +131,9 @@
     private HttpURLConnection openConnection(URL finalURL) throws IOException {
         HttpURLConnection connection = (HttpURLConnection) finalURL.openConnection();
         connection.addRequestProperty("Accept-Encoding", "gzip");
-        connection.setConnectTimeout(getConnectTimeout());
-        connection.setReadTimeout(getReadTimeout());
+        // mind, connect timeout is in seconds
+        connection.setConnectTimeout(1000 * getConnectTimeout());
+        connection.setReadTimeout(1000 * getReadTimeout());
 
         final String username = getUser();
         final String password = getPassword();