aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2012-12-19 21:37:29 +0100
committerSamuel Tardieu <sam@rfc1149.net>2012-12-19 21:38:24 +0100
commitdf330315f2a5af1950f56f647a8c94c9c606b4a3 (patch)
tree2bfad0b33b2a8889e12bde611a6f8f721368b3fe
parent5df35ad86f4b0b94bb9c1abac989e6722c0a3bbf (diff)
downloadcgeo-df330315f2a5af1950f56f647a8c94c9c606b4a3.zip
cgeo-df330315f2a5af1950f56f647a8c94c9c606b4a3.tar.gz
cgeo-df330315f2a5af1950f56f647a8c94c9c606b4a3.tar.bz2
Fix NPE on database migration
File#listFiles() may return null when the object it is applied to is not a directory.
-rw-r--r--main/src/cgeo/geocaching/cgData.java10
1 files 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();
+ }
}
}
}