Changeset 17808 in josm for trunk

Timestamp:

2021-04-20T23:52:29+02:00 (3 years ago)

Author:

simon04

Message:

see #20745 - Avoid heap allocations in MapCSS MatchingReferrerFinder due to Environment.withPrimitive

Fixup r17802.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -17 +17 @@
 import java.util.Objects;
 import java.util.Set;
-import java.util.function.IntFunction;
-import java.util.function.IntSupplier;
 import java.util.stream.Collectors;
 
@@ -26 +24 @@
 import org.openstreetmap.josm.data.osm.IRelationMember;
 import org.openstreetmap.josm.data.osm.IWay;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -219 +216 @@
                     if (!left.matches(e))
                         return;
-                } catch (Exception exception) {
+                } finally {
                     e.osm = osm;
                 }