ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Revert "Workaround for improper timeout for Ping commands""

Browse Source
This commit is contained in:
Marc Blank 2010-12-05 20:45:54 -08:00 committed by Android (Google) Code Review
commit 454f39f68b
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/exchange/EasSyncService.java
View File

@ -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;
}