Changeset 14565 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2018-12-15T21:00:08+01:00 (5 years ago)

Author:

Don-vip

Message:

see #16073 - detection of json errors

File:

• trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -51 +51 @@
     static final Pattern SERVICE_EXCEPTION_PATTERN = Pattern.compile("(?s).+<ServiceException[^>]*>(.+)</ServiceException>.+");
     static final Pattern CDATA_PATTERN = Pattern.compile("(?s)\\s*<!\\[CDATA\\[(.+)\\]\\]>\\s*");
+    static final Pattern JSON_PATTERN = Pattern.compile("\\{\"message\":\"(.+)\"\\}");
     protected final Tile tile;
     private volatile URL url;
@@ -321 +322 @@
     @Override
     public String detectErrorMessage(String data) {
-        Matcher m = SERVICE_EXCEPTION_PATTERN.matcher(data);
-        return m.matches() ? removeCdata(Utils.strip(m.group(1))) : super.detectErrorMessage(data);
+        Matcher xml = SERVICE_EXCEPTION_PATTERN.matcher(data);
+        Matcher json = JSON_PATTERN.matcher(data);
+        return xml.matches() ? removeCdata(Utils.strip(xml.group(1)))
+            : json.matches() ? Utils.strip(json.group(1))
+            : super.detectErrorMessage(data);
     }