Changeset 13415 in josm for trunk

Timestamp:

2018-02-12T16:56:28+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15911 - safe handling of WMS exceptions

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

@@ -87 +87 @@
                         tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
             } catch (WMSImagery.WMSGetCapabilitiesException ex3) {
-                String incomingData = ex3.getIncomingData().trim();
+                String incomingData = ex3.getIncomingData() != null ? ex3.getIncomingData().trim() : "";
                 String title = tr("WMS Error");
                 StringBuilder message = new StringBuilder(tr("Could not parse WMS layer list."));