From 4ed77c7a29a508240e926854505953391bb17dfb Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 16 Feb 2012 22:36:57 +0100
Subject: [PATCH] Avoid NullPointerException

---
 src/com/fsck/k9/controller/MessagingController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 6673df75f..06fb59370 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -2189,7 +2189,7 @@ public class MessagingController implements Runnable {
                 Log.d(K9.LOG_TAG, "processingPendingMoveOrCopy: source folder = " + srcFolder
                       + ", " + messages.size() + " messages, destination folder = " + destFolder + ", isCopy = " + isCopy);
 
-            Map <String, String> remoteUidMap = new HashMap<String, String>();
+            Map <String, String> remoteUidMap = null;
 
             if (!isCopy && destFolder.equals(account.getTrashFolderName())) {
                 if (K9.DEBUG)
@@ -2220,7 +2220,7 @@ public class MessagingController implements Runnable {
              * This next part is used to bring the local UIDs of the local destination folder
              * upto speed with the remote UIDs of remote destionation folder.
              */
-            if (!localUidMap.isEmpty() && !remoteUidMap.isEmpty()) {
+            if (!localUidMap.isEmpty() && remoteUidMap != null && !remoteUidMap.isEmpty()) {
                 Set<String> remoteSrcUids = remoteUidMap.keySet();
                 Iterator<String> remoteSrcUidsIterator = remoteSrcUids.iterator();