From df330315f2a5af1950f56f647a8c94c9c606b4a3 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Wed, 19 Dec 2012 21:37:29 +0100
Subject: Fix NPE on database migration

File#listFiles() may return null when the object it is applied to is not
a directory.
---
 main/src/cgeo/geocaching/cgData.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index b151a09..1d275e6 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -677,10 +677,12 @@ public class cgData {
                     return filename.startsWith("map_") && filename.contains("__");
                 }
             };
-            for (File dir : geocodeDirs) {
-                File[] wrongFiles = dir.listFiles(filter);
-                for (File wrongFile : wrongFiles) {
-                    wrongFile.delete();
+            for (final File dir : geocodeDirs) {
+                final File[] wrongFiles = dir.listFiles(filter);
+                if (wrongFiles != null) {
+                    for (final File wrongFile : wrongFiles) {
+                        wrongFile.delete();
+                    }
                 }
             }
         }
-- 
cgit v1.1