Merge commit '0d46f9f87cb7540113c9a4f9903127cacb70d395' into kraken * commit '0d46f9f87cb7540113c9a4f9903127cacb70d395': Fix concurrent modification exception
This commit is contained in:
commit
59c9add49e
@ -1454,7 +1454,9 @@ public class SyncManager extends Service implements Runnable {
|
|||||||
// In this case, we release the mailbox so that we can start another
|
// In this case, we release the mailbox so that we can start another
|
||||||
// thread to do the work
|
// thread to do the work
|
||||||
log("Alarm failed; releasing mailbox");
|
log("Alarm failed; releasing mailbox");
|
||||||
syncManager.releaseMailbox(id);
|
synchronized(sSyncLock) {
|
||||||
|
syncManager.releaseMailbox(id);
|
||||||
|
}
|
||||||
// Shutdown the connection manager; this should close all of our
|
// Shutdown the connection manager; this should close all of our
|
||||||
// sockets and generate IOExceptions all around.
|
// sockets and generate IOExceptions all around.
|
||||||
syncManager.shutdownConnectionManager();
|
syncManager.shutdownConnectionManager();
|
||||||
|
Loading…
Reference in New Issue
Block a user