Changeset 13222 in josm for trunk/src/org

Timestamp:

2017-12-18T02:36:13+01:00 (7 years ago)

Author:

Don-vip

Message:

see #15673 - fix NPE seen in unit test

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -616 +616 @@
             add(new JMenuItem(new LoadTileAction()));
             add(new JMenuItem(new ShowTileInfoAction()));
-            if (ExpertToggleAction.isExpert() && tileSource != null && tileSource.getBaseUrl().contains(".tile.openstreetmap.org/")) {
+            if (ExpertToggleAction.isExpert() && tileSource != null && tileSource.getBaseUrl() != null
+                    && tileSource.getBaseUrl().contains(".tile.openstreetmap.org/")) {
                 add(new JMenuItem(new GetOsmTileStatusAction()));
                 add(new JMenuItem(new MarkOsmTileDirtyAction()));