From a4853b9a8169319ab793fe6bf49e885784f31853 Mon Sep 17 00:00:00 2001 From: Marc Blank Date: Fri, 3 Dec 2010 11:42:31 -0800 Subject: [PATCH] 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 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java index 215380d40..6ad000fe1 100644 --- a/src/com/android/exchange/EasSyncService.java +++ b/src/com/android/exchange/EasSyncService.java @@ -1309,12 +1309,7 @@ public class EasSyncService extends AbstractSyncService { 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; }