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

Timestamp:

2020-05-20T22:51:41+02:00 (5 years ago)

Author:

simon04

Message:

see #19259 - NPE robustness

Possible regression from r16436

File:

• trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java

@@ -25 +25 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.Objects;
 
 import org.openstreetmap.josm.tools.Logging;
@@ -179 +180 @@
                 .filter(aSubGrid -> aSubGrid.isCoordWithin(lon, lat))
                 .map(aSubGrid -> aSubGrid.getSubGridForCoord(lon, lat))
+                .filter(Objects::nonNull)
                 .findFirst().orElse(this);
     }