Changeset 14311 in josm for trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

Timestamp:

2018-10-09T20:04:07+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16824 - better display of WMS errors

File:

• trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -360 +360 @@
                         String data = urlConn.fetchContent();
                         if (!data.isEmpty()) {
-                            Matcher m = HttpClient.getTomcatErrorMatcher(data);
-                            if (m.matches()) {
-                                attributes.setErrorMessage(m.group(1).replace("'", "''"));
+                            String detectErrorMessage = detectErrorMessage(data);
+                            if (detectErrorMessage != null) {
+                                attributes.setErrorMessage(detectErrorMessage);
                             }
                         }
@@ -418 +418 @@
         Logging.warn("JCS - Silent failure during download: {0}", getUrlNoException());
         return false;
+    }
+
+    protected String detectErrorMessage(String data) {
+        Matcher m = HttpClient.getTomcatErrorMatcher(data);
+        return m.matches() ? m.group(1).replace("'", "''") : null;
     }