commit 3dafdc28e38c2720a85d8581b068e09e709ac434
author Jesse Wilson <jessewilson@google.com> Mon Dec 06 15:23:52 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 06 15:23:52 2010 -0800
tree 0089bce5a15860c91ab373e70773f714d177831d
parent f0035c0e7077bc2d7a8aaf6516d96b0d2b1ba22d
parent e7c14c45c80070fee70451deb8a0a53de66e5a43

Merge "Use proxies specified by system properties in DefaultHttpClient."

src/org/apache/http/impl/client/DefaultRequestDirector.java

diff --git a/src/org/apache/http/impl/client/DefaultRequestDirector.java b/src/org/apache/http/impl/client/DefaultRequestDirector.java
index 511f8a0..6df6246 100644
--- a/src/org/apache/http/impl/client/DefaultRequestDirector.java
+++ b/src/org/apache/http/impl/client/DefaultRequestDirector.java
@@ -346,7 +346,13 @@
                 // Reopen connection if needed
                 if (!managedConn.isOpen()) {
                     managedConn.open(route, context, params);
-                } 
+                }
+                // BEGIN android-added
+                else {
+                    // b/3241899 set the per request timeout parameter on reused connections
+                    managedConn.setSocketTimeout(HttpConnectionParams.getSoTimeout(params));
+                }
+                // END android-added
                 
                 try {
                     establishRoute(route, context);