From e68a383045a5fbf8f452f1946ccb9a886abc5e11 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 31 Jul 2020 09:01:50 +0200 Subject: [PATCH] DATAREDIS-1195 - Polishing. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simplify Expiration.from(…) construction. Original pull request: #553. --- .../data/redis/cache/DefaultRedisCacheWriter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java b/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java index 6567d3157..4696a4c59 100644 --- a/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java +++ b/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java @@ -130,8 +130,9 @@ class DefaultRedisCacheWriter implements RedisCacheWriter { try { boolean put; + if (shouldExpireWithin(ttl)) { - put = connection.set(key, value, Expiration.milliseconds(ttl.toMillis()), SetOption.ifAbsent()); + put = connection.set(key, value, Expiration.from(ttl), SetOption.ifAbsent()); } else { put = connection.setNX(key, value); }