Changeset 944 in josm for trunk/src/org/openstreetmap

Timestamp:

2008-09-11T08:45:05+02:00 (16 years ago)

Author:

stoecker

Message:

fixing NPE. Closes #1532, #1531, #1529. Patch by avar

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -81 +81 @@
                         /* calculate time differences in waypoints */
                         double time = wpt.time;
-                        if (firstTime < 0) {
+                        boolean wpt_has_link = wpt.attr.containsKey("link");
+                        if (firstTime < 0 && wpt_has_link) {
                                 firstTime = time;
                                 for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get("link")) {
@@ -88 +89 @@
                                 }
                         }
-                        for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get("link")) {
-                                if (!oneLink.uri.equals(lastLinkedFile))firstTime = time;
-                                lastLinkedFile = oneLink.uri;
-                                break;
+                        if (wpt_has_link) {
+                                for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get("link")) {
+                                        if (!oneLink.uri.equals(lastLinkedFile))firstTime = time;
+                                        lastLinkedFile = oneLink.uri;
+                                        break;
+                                }
                         }
             Marker m = Marker.createMarker(wpt, indata.storageFile, this, time, time - firstTime);