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

Timestamp:

2017-12-29T16:18:37+01:00 (7 years ago)

Author:

Don-vip

Message:

Correctly handle WMS capabilities encoding. Do not assume every server replies in UTF-8

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (4 diffs)

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

@@ -5 +5 @@
 import java.io.IOException;
 import java.io.StringReader;
+import java.io.StringWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -24 +25 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 
 import org.openstreetmap.josm.data.Bounds;
@@ -229 +235 @@
 
         final Response response = HttpClient.create(getCapabilitiesUrl).connect();
-        final String incomingData = response.fetchContent();
-        Logging.debug("Server response to Capabilities request:");
-        Logging.debug(incomingData);
+        String incomingData = null;
 
         if (response.getResponseCode() >= 400) {
-            throw new WMSGetCapabilitiesException(response.getResponseMessage(), incomingData);
+            throw new WMSGetCapabilitiesException(response.getResponseMessage(), response.fetchContent());
         }
 
@@ -243 +247 @@
                 return new InputSource(new StringReader(""));
             });
-            Document document = builder.parse(new InputSource(new StringReader(incomingData)));
+            Document document = builder.parse(response.getContent());
             Element root = document.getDocumentElement();
+
+            try {
+                StringWriter writer = new StringWriter();
+                TransformerFactory.newInstance().newTransformer().transform(new DOMSource(document), new StreamResult(writer));
+                incomingData = writer.getBuffer().toString();
+                Logging.debug("Server response to Capabilities request:");
+                Logging.debug(incomingData);
+            } catch (TransformerFactoryConfigurationError | TransformerException e) {
+                Logging.warn(e);
+            }
 
             // Check if the request resulted in ServiceException