Changeset 13886 in josm for trunk/src/org

Timestamp:

2018-06-04T00:00:17+02:00 (6 years ago)

Author:

wiktorn

Message:

Fix handling of minimumExpiryTime

File:

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

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

@@ -248 +248 @@
         // at least for some short period of time, but not too long
         if (ret.getExpirationTime() < now + Math.max(MINIMUM_EXPIRES.get(), options.getMinimumExpiryTime())) {
-            ret.setExpirationTime(now + MINIMUM_EXPIRES.get());
+            ret.setExpirationTime(now + Math.max(MINIMUM_EXPIRES.get(), TimeUnit.SECONDS.toMillis(options.getMinimumExpiryTime())));
         }
         if (ret.getExpirationTime() > now + Math.max(MAXIMUM_EXPIRES.get(), options.getMinimumExpiryTime())) {
-            ret.setExpirationTime(now + MAXIMUM_EXPIRES.get());
+            ret.setExpirationTime(now + Math.max(MAXIMUM_EXPIRES.get(), TimeUnit.SECONDS.toMillis(options.getMinimumExpiryTime())));
         }
         return ret;