From 0a474bd3d9c379c8ce409624c10dc0fd70e0f396 Mon Sep 17 00:00:00 2001
From: stleusc <sl@j17mail.com>
Date: Sun, 1 Dec 2013 19:54:16 -0500
Subject: [PATCH 1/2] Close FileHandle

---
 .../oscim/tiling/source/mapfile/MapFileTileSource.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java b/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
index 556ac3d9..a37838f5 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
@@ -40,6 +40,7 @@ public class MapFileTileSource extends TileSource {
 	IndexCache databaseIndexCache;
 	boolean experimental;
 	File mapFile;
+	RandomAccessFile mInputFile;
 
 	public boolean setMapFile(String filename) {
 		setOption("file", filename);
@@ -78,7 +79,7 @@ public class MapFileTileSource extends TileSource {
 			}
 
 			// open the file in read only mode
-			RandomAccessFile mInputFile = new RandomAccessFile(file, READ_ONLY_MODE);
+			mInputFile = new RandomAccessFile(file, READ_ONLY_MODE);
 			long mFileSize = mInputFile.length();
 			ReadBuffer mReadBuffer = new ReadBuffer(mInputFile);
 
@@ -117,7 +118,14 @@ public class MapFileTileSource extends TileSource {
 
 	@Override
 	public void close() {
+		if (mInputFile != null) {
+			try {
+				mInputFile.close();
+			} catch (IOException e) {
+			}
+		}
 
+		mInputFile = null;
 		fileHeader = null;
 		fileInfo = null;
 		mapFile = null;

From e6eecebf4e4bb0d3218cdfb08c955be20872dcd7 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Tue, 3 Dec 2013 01:18:53 +0100
Subject: [PATCH 2/2] use IOUtils to close file

---
 .../oscim/tiling/source/mapfile/MapFileTileSource.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java b/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
index a37838f5..30b4c18c 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
@@ -23,6 +23,7 @@ import org.oscim.tiling.source.ITileDataSource;
 import org.oscim.tiling.source.TileSource;
 import org.oscim.tiling.source.mapfile.header.MapFileHeader;
 import org.oscim.tiling.source.mapfile.header.MapFileInfo;
+import org.oscim.utils.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -118,13 +119,7 @@ public class MapFileTileSource extends TileSource {
 
 	@Override
 	public void close() {
-		if (mInputFile != null) {
-			try {
-				mInputFile.close();
-			} catch (IOException e) {
-			}
-		}
-
+		IOUtils.closeQuietly(mInputFile);
 		mInputFile = null;
 		fileHeader = null;
 		fileInfo = null;