Changeset 8636 in josm for trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

Timestamp:

2015-08-02T12:14:18+02:00 (9 years ago)

Author:

wiktorn

Message:

Small TMS fixes.

• fix handling of minimum and maximum expiration times (tiles were usually set for expiration at 1 month instead what headers returned)
• fix right-click menu command "Load tile" not reloading the tiles
• fix null pointer dereference reported by Coverity

File:

• trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (modified) (1 diff)

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

@@ -252 +252 @@
         // keep the expiration time between MINIMUM_EXPIRES and MAXIMUM_EXPIRES, so we will cache the tiles
         // at least for some short period of time, but not too long
-        if (ret.getExpirationTime() < MINIMUM_EXPIRES) {
+        if (ret.getExpirationTime() < now + MINIMUM_EXPIRES) {
             ret.setExpirationTime(now + MINIMUM_EXPIRES);
         }
-        if (ret.getExpirationTime() > MAXIMUM_EXPIRES) {
+        if (ret.getExpirationTime() > now + MAXIMUM_EXPIRES) {
             ret.setExpirationTime(now + MAXIMUM_EXPIRES);
         }