From 3139d43ee296bdd5830a4483beb5328a751161e7 Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Thu, 29 Apr 2010 20:41:07 -0700
Subject: [PATCH] Fix NPE in SyncManager

Bug: 2644142
Change-Id: I4336aef65669b7a4a32e43e8068edd4dd9772b03
---
 src/com/android/exchange/SyncManager.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index bce3c91fc..9f20e89b7 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -1180,8 +1180,10 @@ public class SyncManager extends Service implements Runnable {
     }
 
     static private synchronized void shutdownConnectionManager() {
-        sClientConnectionManager.shutdown();
-        sClientConnectionManager = null;
+        if (sClientConnectionManager != null) {
+            sClientConnectionManager.shutdown();
+            sClientConnectionManager = null;
+        }
     }
 
     public static void stopAccountSyncs(long acctId) {