Changeset 15652 in josm for trunk/src

Timestamp:

2020-01-06T23:22:18+01:00 (5 years ago)

Author:

Don-vip

Message:

see #18494 - fix NPE when downloading GPX data by bounds and not by URL

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -153 +153 @@
         private String getLayerName() {
             // Extract .gpx filename from URL to set the new layer name
-            final Matcher matcher = Pattern.compile(GpxUrlPattern.EXTERNAL_GPX_FILE.pattern()).matcher(url);
-            final String newLayerName = matcher.matches() ? matcher.group(1) : null;
+            final Matcher matcher = url != null ? Pattern.compile(GpxUrlPattern.EXTERNAL_GPX_FILE.pattern()).matcher(url) : null;
+            final String newLayerName = matcher != null && matcher.matches() ? matcher.group(1) : null;
             final String metadataName = rawData != null ? rawData.getString(GpxConstants.META_NAME) : null;
             final String defaultName = tr("Downloaded GPX Data");