Changeset 17846 in josm for trunk/src/org/openstreetmap/josm/io/GpxReader.java

Timestamp:

2021-05-01T21:50:00+02:00 (5 years ago)

Author:

simon04

Message:

fix #20793 - Reduce memory consumption for GpxExtensionCollection (patch by Bjoeni, modified)

File:

• trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) (2 diffs)

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

@@ -507 +507 @@
                     if (!currentTrackSeg.isEmpty()) {
                         GpxTrackSegment seg = new GpxTrackSegment(currentTrackSeg);
-                        seg.getExtensions().addAll(currentExtensionCollection);
+                        if (!currentExtensionCollection.isEmpty()) {
+                            seg.getExtensions().addAll(currentExtensionCollection);
+                        }
                         currentTrack.add(seg);
                     }
@@ -519 +521 @@
                     convertUrlToLink(currentTrackAttr);
                     GpxTrack trk = new GpxTrack(new ArrayList<>(currentTrack), currentTrackAttr);
-                    trk.getExtensions().addAll(currentTrackExtensionCollection);
+                    if (!currentTrackExtensionCollection.isEmpty()) {
+                        trk.getExtensions().addAll(currentTrackExtensionCollection);
+                    }
                     data.addTrack(trk);
                     currentTrackExtensionCollection.clear();