Changeset 13631 in josm

Timestamp:

2018-04-15T14:11:59+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16129 - better catch of WMS ServiceExceptions

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJobTest.java (added)

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

@@ -35 +35 @@
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -45 +46 @@
     private static final LongProperty MAXIMUM_EXPIRES = new LongProperty("imagery.generic.maximum_expires", TimeUnit.DAYS.toMillis(30));
     private static final LongProperty MINIMUM_EXPIRES = new LongProperty("imagery.generic.minimum_expires", TimeUnit.HOURS.toMillis(1));
-    private static final Pattern SERVICE_EXCEPTION_PATTERN = Pattern.compile("(?s).+<ServiceException>(.+)</ServiceException>.+");
+    static final Pattern SERVICE_EXCEPTION_PATTERN = Pattern.compile("(?s).+<ServiceException[^>]*>(.+)</ServiceException>.+");
     protected final Tile tile;
     private volatile URL url;
@@ -280 +281 @@
                         Matcher m = SERVICE_EXCEPTION_PATTERN.matcher(s);
                         if (m.matches()) {
-                            tile.setError(m.group(1));
-                            Logging.error(m.group(1));
+                            String message = Utils.strip(m.group(1));
+                            tile.setError(message);
+                            Logging.error(message);
                             Logging.debug(s);
                         } else {