Changeset 36381 in osm

Timestamp:

2025-02-04T16:14:15+01:00 (5 days ago)

Author:

stoecker

Message:

JMapViewer 2.24, see #24116, prevent error when key retrival returns null

Location:

applications/viewer/jmapviewer

Files:

• . (modified) (1 prop)
• pom.xml (modified) (1 diff)
• releases/2.24 (added)
• releases/2.24/JMapViewer-2.24-Source.zip (added)
• releases/2.24/JMapViewer-2.24.zip (added)
• src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (modified) (1 diff)

applications/viewer/jmapviewer/pom.xml

@@ -6 +6 @@
     <groupId>org.openstreetmap.jmapviewer</groupId>
     <artifactId>jmapviewer</artifactId>
-    <version>2.24-SNAPSHOT</version>
+    <version>2.25-SNAPSHOT</version>
 
     <name>JMapViewer</name>

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -159 +159 @@
         if (API_KEY.equals(key)) { // If the API key has not been customized, we try to retrieve the API key
             try {
-                key = FeatureAdapter.retrieveApiKey(this.getId());
+                String rkey = FeatureAdapter.retrieveApiKey(this.getId());
+                if (rkey != null)
+                    key = rkey;
             } catch (IOException ioException) {
                 FeatureAdapter.getLogger(this.getClass()).log(Level.WARNING, "Failed to retrieve api key", ioException);