Changeset 6119 in josm for trunk/src/org

Timestamp:

2013-08-08T19:49:02+02:00 (11 years ago)

Author:

framm

Message:

fix hash url parsing, npe introduced in r6118

File:

• trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -85 +85 @@
     private static Bounds parseHashURLs(String url) {
         int startIndex = url.indexOf("=");
+        if (startIndex == -1) return null;
         int endIndex = url.indexOf("&");
-        String coordPart = url.substring(startIndex+1, endIndex);
-        System.out.println(coordPart);
-
-        String[] parts = coordPart.split("/");
-        Bounds b = positionToBounds(Double.parseDouble(parts[1]),
-                Double.parseDouble(parts[2]),
-                Integer.parseInt(parts[0]));
-        return b;
+        if (endIndex == -1) endIndex = url.length();
+        try
+        {
+            String coordPart = url.substring(startIndex+1, endIndex);
+            String[] parts = coordPart.split("/");
+            Bounds b = positionToBounds(Double.parseDouble(parts[1]),
+                    Double.parseDouble(parts[2]),
+                    Integer.parseInt(parts[0]));
+            return b;
+        }
+        catch(Exception ex)
+        {
+            return null;
+        }
     }