From e444155bce035fe1315bcb8ab8782f528cec010b Mon Sep 17 00:00:00 2001
From: Paul Westbrook <pwestbro@google.com>
Date: Mon, 6 Aug 2012 10:50:00 -0700
Subject: Fix ConcurrentModificationException

Bug: 6937046
Change-Id: I82e578d9b31b0064570deee9a9625ddf07826112
---
 emailsync/src/com/android/emailsync/SyncManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'emailsync/src/com')

diff --git a/emailsync/src/com/android/emailsync/SyncManager.java b/emailsync/src/com/android/emailsync/SyncManager.java
index e4e155e91..0500837fd 100644
--- a/emailsync/src/com/android/emailsync/SyncManager.java
+++ b/emailsync/src/com/android/emailsync/SyncManager.java
@@ -1931,7 +1931,9 @@ public abstract class SyncManager extends Service implements Runnable {
                             log("Dead thread, mailbox released: " +
                                     c.getString(Mailbox.CONTENT_DISPLAY_NAME_COLUMN));
                         }
-                        releaseMailbox(mailboxId);
+                        synchronized (sSyncLock) {
+                            releaseMailbox(mailboxId);
+                        }
                         // Restart this if necessary
                         if (nextWait > 3*SECONDS) {
                             nextWait = 3*SECONDS;
-- 
cgit v1.2.3