Changeset 35066 in osm for applications/editors/josm/plugins/ElevationProfile

Timestamp:

2019-07-15T00:23:23+02:00 (5 years ago)

Author:

donvip

Message:

fix #josm17926 - NPE

File:

• applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationProfile.java (modified) (2 diffs)

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationProfile.java

@@ -10 +10 @@
 import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
 import org.openstreetmap.josm.plugins.elevation.IElevationProfile;
+import org.openstreetmap.josm.tools.Logging;
 
 
@@ -305 +306 @@
 
         if (wp1 != null && wp2 != null) {
-            return wp2.getDate().getTime() - wp1.getDate().getTime();
+            Date wp1Date = wp1.getDate();
+            Date wp2Date = wp2.getDate();
+            if (wp1Date != null && wp2Date != null) {
+                return wp2Date.getTime() - wp1Date.getTime();
+            } else {
+                Logging.warn("Waypoints without date: " + wp1 + " / " + wp2);
+            }
         }