commit f283e3621026b0e3703b750d7b95d706e4bff050
author Dan Egnor <egnor@google.com> Wed Mar 10 16:49:55 2010 -0800
committer Dan Egnor <egnor@google.com> Wed Mar 10 16:49:55 2010 -0800
tree f4a67380deefd9ec3d8c71dbe44e48be6fa0b7b1
parent c357df126183df4a3ea9bf58a08e4813e992585d

Fix rare NPE in DropBoxManagerService

Change-Id: I2e9713802c59feb539d5d4c1ab1dfa21ec88d9f6

services/java/com/android/server/DropBoxManagerService.java

diff --git a/services/java/com/android/server/DropBoxManagerService.java b/services/java/com/android/server/DropBoxManagerService.java
index 667953c..b38f1d2 100644
--- a/services/java/com/android/server/DropBoxManagerService.java
+++ b/services/java/com/android/server/DropBoxManagerService.java
@@ -603,7 +603,9 @@
             for (EntryFile late : future) {
                 mAllFiles.blocks -= late.blocks;
                 FileList tagFiles = mFilesByTag.get(late.tag);
-                if (tagFiles.contents.remove(late)) tagFiles.blocks -= late.blocks;
+                if (tagFiles != null && tagFiles.contents.remove(late)) {
+                    tagFiles.blocks -= late.blocks;
+                }
                 if ((late.flags & DropBoxManager.IS_EMPTY) == 0) {
                     enrollEntry(new EntryFile(
                             late.file, mDropBoxDir, late.tag, t++, late.flags, mBlockSize));