commit 4824be85422975124ee5296bcbc6403be3d206ec
author Marc Blank <mblank@google.com> Fri Dec 03 11:42:31 2010 -0800
committer Marc Blank <mblank@google.com> Fri Dec 03 11:42:43 2010 -0800
tree 6518fd12706698545b78974984779c157ad2a7e8
parent 608d6cd3bfb4a5cae7276005b54be74b0e5ba01f

Revert "Workaround for improper timeout for Ping commands"

* The underlying bug was fixed by bdc in I080147b017b961502b3ba98d40841fea679491eb

This reverts commit 9166aa46da96d179b5124d96babf9a34c8e1d619.

Change-Id: I51e7e585e7b1624cc2b08ea81baba6f2602a76cf

src/com/android/exchange/EasSyncService.java

diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index 215380d..6ad000f 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -1309,12 +1309,7 @@
         HttpConnectionParams.setConnectionTimeout(params, CONNECTION_TIMEOUT);
         HttpConnectionParams.setSoTimeout(params, timeout);
         HttpConnectionParams.setSocketBufferSize(params, 8192);
-        //HttpClient client = new DefaultHttpClient(getClientConnectionManager(), params);
-        // STOPSHIP Replace this line with the previous, commented-out line
-        // The underlying problem (socket timeout is not being updated for reused, pooled
-        // connections) needs to be fixed prior to ship
-        HttpClient client = new DefaultHttpClient(
-                timeout == COMMAND_TIMEOUT ? getClientConnectionManager() : null, params);
+        HttpClient client = new DefaultHttpClient(getClientConnectionManager(), params);
         return client;
     }