MapFile: fix NPE on close

mapsforge · Jun 30, 2016 · 45408e7 · 45408e7
1 parent 372dab3
commit 45408e7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/mapsforge-map-reader/src/main/java/org/mapsforge/map/reader/MapFile.java b/mapsforge-map-reader/src/main/java/org/mapsforge/map/reader/MapFile.java
@@ -238,7 +238,6 @@ public MapFile(File mapFile, String language) {
 
             this.timestamp = mapFile.lastModified();
         } catch (Exception e) {
-            LOGGER.log(Level.SEVERE, e.getMessage(), e);
             // make sure that the file is closed
             closeFile();
             throw new MapFileException(e.getMessage());
@@ -285,7 +284,9 @@ private void closeFile() {
             if (this.databaseIndexCache != null) {
                 this.databaseIndexCache.destroy();
             }
-            this.inputFile.close();
+            if (this.inputFile != null) {
+                this.inputFile.close();
+            }
         } catch (Exception e) {
             LOGGER.log(Level.SEVERE, e.getMessage(), e);
         }