Changeset 18596 in josm for trunk

Timestamp:

2022-11-14T16:35:19+01:00 (18 months ago)

Author:

taylor.smock

Message:

Fix CID 1500602: getFile returns null (RemoteEntry#getFile)

While RemoteEntry overrides getImageURI, it is technically possible for
someone else to implement this interface and return null from getFile
while not overriding getImageURI.

File:

• trunk/src/org/openstreetmap/josm/data/imagery/street_level/IImageEntry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/street_level/IImageEntry.java

@@ -188 +188 @@
      */
     default URI getImageURI() {
-        return this.getFile().toURI();
+        File file = this.getFile();
+        if (file != null) {
+            return file.toURI();
+        }
+        return null;
     }