svn commit: r1213413 - in /maven/wagon/trunk/wagon-providers: wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/ wagon-http/src/test/java/org/apache/maven/wagon/providers/http/

[olamy]

Author: olamy
Date: Mon Dec 12 20:15:21 2011
New Revision: 1213413

URL: http://svn.apache.org/viewvc?rev=1213413&view=rev
Log:
[WAGON-365] increase default read timeout value to 30 minutes.
wagon-http impl user config must win.

Modified:
    
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java
    
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HttpMethodConfiguration.java
    
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java

Modified: 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java?rev=1213413&r1=1213412&r2=1213413&view=diff
==============================================================================
--- 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java
 (original)
+++ 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java
 Mon Dec 12 20:15:21 2011
@@ -663,9 +663,10 @@ public abstract class AbstractHttpClient
             }
         }
 
-        if ( config == null || config.getReadTimeout() == 
HttpMethodConfiguration.DEFAULT_CONNECTION_TIMEOUT )
+        if ( config == null || config.getReadTimeout() == 
HttpMethodConfiguration.DEFAULT_READ_TIMEOUT )
         {
-            method.getParams().setParameter( CoreConnectionPNames.SO_TIMEOUT, 
getTimeout() );
+            int readTimeout = getReadTimeout();
+            method.getParams().setParameter( CoreConnectionPNames.SO_TIMEOUT, 
readTimeout );
         }
     }
 

Modified: 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HttpMethodConfiguration.java
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HttpMethodConfiguration.java?rev=1213413&r1=1213412&r2=1213413&view=diff
==============================================================================
--- 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HttpMethodConfiguration.java
 (original)
+++ 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/HttpMethodConfiguration.java
 Mon Dec 12 20:15:21 2011
@@ -40,7 +40,7 @@ public class HttpMethodConfiguration
 
     public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
 
-    public static final int DEFAULT_READ_TIMEOUT = 60000;
+    public static final int DEFAULT_READ_TIMEOUT = 1800000;
 
     private static final String COERCE_PATTERN = "%(\\w+),(.+)";
 

Modified: 
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java?rev=1213413&r1=1213412&r2=1213413&view=diff
==============================================================================
--- 
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java
 (original)
+++ 
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java
 Mon Dec 12 20:15:21 2011
@@ -53,7 +53,7 @@ public class HttpWagonTimeoutTest
         try
         {
             Wagon wagon = getWagon();
-            wagon.setTimeout( 1000 );
+            wagon.setReadTimeout( 1000 );
 
             Repository testRepository = new Repository();
             testRepository.setUrl( "http://localhost:"; + httpServerPort );
@@ -88,7 +88,7 @@ public class HttpWagonTimeoutTest
         try
         {
             Wagon wagon = getWagon();
-            wagon.setTimeout( 1000 );
+            wagon.setReadTimeout( 1000 );
 
             Repository testRepository = new Repository();
             testRepository.setUrl( "http://localhost:"; + httpServerPort );
@@ -120,7 +120,7 @@ public class HttpWagonTimeoutTest
         try
         {
             Wagon wagon = getWagon();
-            wagon.setTimeout( 1000 );
+            wagon.setReadTimeout( 1000 );
 
             Repository testRepository = new Repository();
             testRepository.setUrl( "http://localhost:"; + httpServerPort );
@@ -152,7 +152,7 @@ public class HttpWagonTimeoutTest
         try
         {
             Wagon wagon = getWagon();
-            wagon.setTimeout( 1000 );
+            wagon.setReadTimeout( 1000 );
 
             Repository testRepository = new Repository();
             testRepository.setUrl( "http://localhost:"; + httpServerPort );