X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2Fsrtm%2FTileFinder.java;h=60a9479d1289faae0523e0fd7d025b56e816d37e;hb=81843c3d8d0771bf00d0f26034a13aa515465c78;hp=209db7f58d439208caa363097236f40805957640;hpb=c0387c124840c9407e040600fda88f3c3e8f6aa6;p=GpsPrune.git

diff --git a/tim/prune/function/srtm/TileFinder.java b/tim/prune/function/srtm/TileFinder.java
index 209db7f..60a9479 100644
--- a/tim/prune/function/srtm/TileFinder.java
+++ b/tim/prune/function/srtm/TileFinder.java
@@ -13,7 +13,7 @@ import java.util.ArrayList;
 public abstract class TileFinder
 {
 	/** URL prefix for all tiles */
-	private static final String URL_PREFIX = "http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/";
+	private static final String URL_PREFIX = "https://dds.cr.usgs.gov/srtm/version2_1/SRTM3/";
 	/** Directory names for each continent */
 	private static final String[] CONTINENTS = {"", "Eurasia", "North_America", "Australia",
 		"Islands", "South_America", "Africa"};
@@ -54,10 +54,11 @@ public abstract class TileFinder
 	 */
 	private static byte[] readDatFile()
 	{
+		InputStream in = null;
 		try
 		{
 			// Need absolute path to dat file
-			InputStream in = TileFinder.class.getResourceAsStream("/tim/prune/function/srtm/srtmtiles.dat");
+			in = TileFinder.class.getResourceAsStream("/tim/prune/function/srtm/srtmtiles.dat");
 			if (in != null)
 			{
 				byte[] buffer = new byte[in.available()];
@@ -69,6 +70,13 @@ public abstract class TileFinder
 		catch (java.io.IOException e) {
 			System.err.println("Exception trying to read srtmtiles.dat : " + e.getMessage());
 		}
+		finally
+		{
+			try {
+				in.close();
+			}
+			catch (Exception e) {} // ignore
+		}
 		return null;
 	}
 }