From 9cf701f90e2d3571d49aa105ec994b7108206051 Mon Sep 17 00:00:00 2001 From: Xiaohu Zhang Date: Thu, 16 Nov 2017 14:58:57 +0100 Subject: [PATCH] =?UTF-8?q?DATAREDIS-706=20-=20Remove=20redundant=20null?= =?UTF-8?q?=20checks=20from=20JedisClusterStringCommands.set(=E2=80=A6).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original pull request: #278. --- .../redis/connection/jedis/JedisClusterStringCommands.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStringCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStringCommands.java index e9620d812..9150c23b6 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStringCommands.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStringCommands.java @@ -127,9 +127,9 @@ class JedisClusterStringCommands implements RedisStringCommands { Assert.notNull(expiration, "Expiration must not be null!"); Assert.notNull(option, "Option must not be null!"); - if (expiration == null || expiration.isPersistent()) { + if (expiration.isPersistent()) { - if (option == null || ObjectUtils.nullSafeEquals(SetOption.UPSERT, option)) { + if (ObjectUtils.nullSafeEquals(SetOption.UPSERT, option)) { return set(key, value); } else { @@ -142,7 +142,7 @@ class JedisClusterStringCommands implements RedisStringCommands { } } else { - if (option == null || ObjectUtils.nullSafeEquals(SetOption.UPSERT, option)) { + if (ObjectUtils.nullSafeEquals(SetOption.UPSERT, option)) { if (ObjectUtils.nullSafeEquals(TimeUnit.MILLISECONDS, expiration.getTimeUnit())) { return pSetEx(key, expiration.getExpirationTime(), value);