[Git][debian-gis-team/jmapviewer][upstream] New upstream version 2.11+dfsg

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / jmapviewer


Commits:
1460c284 by Bas Couwenberg at 2019-07-09T04:14:50Z
New upstream version 2.11+dfsg
- - - - -


1 changed file:

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


Changes:

=====================================
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) {



View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/commit/1460c284689fb5e13f3a38db7aa5a969dbb33c71

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/commit/1460c284689fb5e13f3a38db7aa5a969dbb33c71
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190709/0d7be661/attachment-0001.html>