* Handle the case in which a Mailbox to be synced doesn't have
  a serverId (rare case which happened to a Zimbra user)
* Tweak logging to improve debugability of similar issues

Bug: 2551196
Change-Id: Id61cee5c4b33eb2f87455fbae0899fec8ff3748f
This commit is contained in:
Marc Blank 2010-04-07 09:40:19 -07:00
parent c94c077a66
commit 0cf741bb0a

View File

@ -1598,7 +1598,7 @@ public class SyncManager extends Service implements Runnable {
thread.start();
mServiceMap.put(m.mId, service);
runAwake(m.mId);
if (!m.mServerId.startsWith(Eas.ACCOUNT_MAILBOX_PREFIX)) {
if ((m.mServerId != null) && !m.mServerId.startsWith(Eas.ACCOUNT_MAILBOX_PREFIX)) {
stopPing(m.mAccountKey);
}
}
@ -1782,9 +1782,12 @@ public class SyncManager extends Service implements Runnable {
}
}
}
stopServiceThreads();
log("Shutdown requested");
} catch (RuntimeException e) {
Log.e(TAG, "RuntimeException in SyncManager", e);
throw e;
} finally {
log("Finishing SyncManager");
// Lots of cleanup here
// Stop our running syncs
stopServiceThreads();