am 0d46f9f8: am 39e6d3ae: Fix concurrent modification exception

Merge commit '0d46f9f87cb7540113c9a4f9903127cacb70d395' into kraken

* commit '0d46f9f87cb7540113c9a4f9903127cacb70d395':
  Fix concurrent modification exception
This commit is contained in:
Marc Blank 2010-04-29 09:38:47 -07:00 committed by Android Git Automerger
commit 59c9add49e

View File

@ -1454,7 +1454,9 @@ public class SyncManager extends Service implements Runnable {
// In this case, we release the mailbox so that we can start another
// thread to do the work
log("Alarm failed; releasing mailbox");
synchronized(sSyncLock) {
syncManager.releaseMailbox(id);
}
// Shutdown the connection manager; this should close all of our
// sockets and generate IOExceptions all around.
syncManager.shutdownConnectionManager();