Version 19.2, December 2018

[GpsPrune.git] / tim / prune / gui / map / MapSource.java

diff --git a/tim/prune/gui/map/MapSource.java b/tim/prune/gui/map/MapSource.java
index d838ef34d99d47a7f7fe524b8a63e87cf98609b6..c4e294665e128def7d1fcbfb048cb516624d5d00 100644 (file)
--- a/tim/prune/gui/map/MapSource.java
+++ b/tim/prune/gui/map/MapSource.java
@@ -84,11 +84,19 @@ public abstract class MapSource
        {
                if (inUrl == null || inUrl.equals("")) {return null;}
                String urlstr = inUrl;
+               boolean urlOk = false;
+
                // check prefix
-               try {
-                       new URL(urlstr.replace('[', 'w').replace(']', 'w'));
+               try
+               {
+                       urlOk = new URL(urlstr.replace('[', 'w').replace(']', 'w')).toString() != null;
                }
                catch (MalformedURLException e)
+               {
+                       urlOk = false;
+               }
+
+               if (!urlOk)
                {
                        // fail if protocol specified
                        if (urlstr.indexOf("://") >= 0) {return null;}
@@ -100,7 +108,8 @@ public abstract class MapSource
                        urlstr = urlstr + "/";
                }
                // Validate current url, return null if not ok
-               try {
+               try
+               {
                        URL url = new URL(urlstr.replace('[', 'w').replace(']', 'w'));
                        // url host must contain a dot
                        if (url.getHost().indexOf('.') < 0) {return null;}