Changeset 11397 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-12-14T15:50:53+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S2259 - Null pointers should not be dereferenced

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• BoundingBoxDownloader.java (modified) (1 diff)
• GpxReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -94 +94 @@
                 // API 0.6 does not support requests crossing the 180th meridian, so make two requests
                 GpxData result = downloadRawGps(new Bounds(lat1, lon1, lat2, 180.0), progressMonitor);
-                result.mergeFrom(downloadRawGps(new Bounds(lat1, -180.0, lat2, lon2), progressMonitor));
+                if (result != null)
+                    result.mergeFrom(downloadRawGps(new Bounds(lat1, -180.0, lat2, lon2), progressMonitor));
                 return result;
             } else {

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -399 +399 @@
                 } else if (currentState != State.LINK) {
                     Map<String, Object> attr = getAttr();
-                    if (!attr.containsKey(META_LINKS)) {
+                    if (attr != null && !attr.containsKey(META_LINKS)) {
                         attr.put(META_LINKS, new LinkedList<GpxLink>());
                     }
-                    ((Collection<GpxLink>) attr.get(META_LINKS)).add(currentLink);
+                    if (attr != null)
+                        ((Collection<GpxLink>) attr.get(META_LINKS)).add(currentLink);
                 }
                 break;