debian/changelog

-jmapviewer (2.10+dfsg-2) UNRELEASED; urgency=medium
+jmapviewer (2.11+dfsg-1) unstable; urgency=medium
 
+  * New upstream release.
   * Update gbp.conf to use --source-only-changes by default.
 
- -- Bas Couwenberg <sebastic@debian.org>  Sun, 07 Jul 2019 07:34:18 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 09 Jul 2019 06:15:54 +0200
 
 jmapviewer (2.10+dfsg-1) unstable; urgency=medium
 

src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -13,7 +13,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
@@ -275,9 +274,7 @@ public class BingAerialTileSource extends TMSTileSource {
             }
         }
         try {
-            return attributions.get(0, TimeUnit.MILLISECONDS);
-        } catch (TimeoutException ex) {
-            LOG.log(Level.WARNING, "Bing: attribution data is not yet loaded.");
+            return attributions.get();
         } catch (ExecutionException ex) {
             throw new RuntimeException(ex.getCause());
         } catch (InterruptedException ign) {