am 09f0ab04: Merge "Fix NPE in SyncManager" into froyo

Merge commit '09f0ab0454ee59170025337b786dd7cf8837d2ed' into froyo-plus-aosp

* commit '09f0ab0454ee59170025337b786dd7cf8837d2ed':
  Fix NPE in SyncManager
This commit is contained in:
Marc Blank 2010-04-30 11:22:57 -07:00 committed by Android Git Automerger
commit 79ace45187

View File

@ -1180,8 +1180,10 @@ public class SyncManager extends Service implements Runnable {
} }
static private synchronized void shutdownConnectionManager() { static private synchronized void shutdownConnectionManager() {
sClientConnectionManager.shutdown(); if (sClientConnectionManager != null) {
sClientConnectionManager = null; sClientConnectionManager.shutdown();
sClientConnectionManager = null;
}
} }
public static void stopAccountSyncs(long acctId) { public static void stopAccountSyncs(long acctId) {