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

Timestamp:

2021-08-22T13:52:08+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21239 - fix NPE

File:

• trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MVTTile.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MVTTile.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.imagery.vectortile.mapbox;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.gui.jmapviewer.Tile;
@@ -13 +22 @@
 import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.Logging;
-
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
@@ -68 +69 @@
                 return mvtLayer;
             }).collect(Collectors.toCollection(HashSet::new));
-            this.extent = layers.stream().map(Layer::getExtent).max(Integer::compare).orElse(Layer.DEFAULT_EXTENT);
+            this.extent = layers.stream().filter(Objects::nonNull).mapToInt(Layer::getExtent).max().orElse(Layer.DEFAULT_EXTENT);
             if (this.getData() != null) {
                 this.finishLoading();