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

Timestamp:

2018-05-31T00:51:20+02:00 (6 years ago)

Author:

wiktorn

Message:

Fix identifying if getMapUrl contains query part.

See: #16330

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -432 +432 @@
                         // TODO should we handle also POST?
                         if ("GET".equalsIgnoreCase(mode) && getMapUrl != null && !"".equals(getMapUrl)) {
-                            if (getMapUrl.endsWith("?")) {
-                                this.getMapUrl = getMapUrl;
-                            } else {
-                                this.getMapUrl = getMapUrl + "?";
+                            try {
+                                String query = (new URL(getMapUrl)).getQuery();
+                                if (query == null || query.isEmpty()) {
+                                    this.getMapUrl = getMapUrl + "?";
+                                } else {
+                                    this.getMapUrl = getMapUrl;
+                                }
+                            } catch (MalformedURLException e) {
+                                throw new XMLStreamException(e);
                             }
                         }