From 59d457f70572a0d255389405b22cf2381ce86ed6 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 27 May 2026 09:40:42 +0800 Subject: [PATCH] Remove unnecessary null check See gh-50504 Signed-off-by: Yanming Zhou --- .../redis/LettuceConnectionConfiguration.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java index da72b63bfcb..fc14d701bde 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java @@ -155,15 +155,13 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration { if (getProperties().getTimeout() != null) { builder.commandTimeout(getProperties().getTimeout()); } - if (getProperties().getLettuce() != null) { - RedisProperties.Lettuce lettuce = getProperties().getLettuce(); - if (lettuce.getShutdownTimeout() != null && !lettuce.getShutdownTimeout().isZero()) { - builder.shutdownTimeout(getProperties().getLettuce().getShutdownTimeout()); - } - String readFrom = lettuce.getReadFrom(); - if (readFrom != null) { - builder.readFrom(getReadFrom(readFrom)); - } + RedisProperties.Lettuce lettuce = getProperties().getLettuce(); + if (lettuce.getShutdownTimeout() != null && !lettuce.getShutdownTimeout().isZero()) { + builder.shutdownTimeout(getProperties().getLettuce().getShutdownTimeout()); + } + String readFrom = lettuce.getReadFrom(); + if (readFrom != null) { + builder.readFrom(getReadFrom(readFrom)); } if (StringUtils.hasText(getProperties().getClientName())) { builder.clientName(getProperties().getClientName());