From fe4d44441492a3c0287c6ffd26e0835e0d1707f3 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Wed, 4 Sep 2019 15:07:07 +0300 Subject: [PATCH] Fixed - RMapCache.remainTimeToLive method returns negative remain time. #2272 --- redisson/src/main/java/org/redisson/RedissonMapCache.java | 2 +- redisson/src/test/java/org/redisson/RedissonMapCacheTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonMapCache.java b/redisson/src/main/java/org/redisson/RedissonMapCache.java index 96046628a..92ed1744b 100644 --- a/redisson/src/main/java/org/redisson/RedissonMapCache.java +++ b/redisson/src/main/java/org/redisson/RedissonMapCache.java @@ -1012,7 +1012,7 @@ public class RedissonMapCache extends RedissonMap implements RMapCac + "return -1; " + "end;" + "if expireDate > tonumber(ARGV[1]) then " - + "return ARGV[1] - expireDate; " + + "return expireDate - ARGV[1]; " + "else " + "return -2; " + "end; " diff --git a/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java b/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java index 0846ce820..704549c6e 100644 --- a/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java +++ b/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java @@ -97,7 +97,7 @@ public class RedissonMapCacheTest extends BaseMapTest { public void testRemainTimeToLive() { RMapCache map = redisson.getMapCache("test"); map.put("1", "2", 2, TimeUnit.SECONDS); - assertThat(map.remainTimeToLive("1")).isLessThan(1900); + assertThat(map.remainTimeToLive("1")).isBetween(1900L, 2000L); map.put("3", "4"); assertThat(map.remainTimeToLive("3")).isEqualTo(-1); assertThat(map.remainTimeToLive("0")).isEqualTo(-2);