From af39d558ff5ca71fad662cc1fc7bb2927640751c Mon Sep 17 00:00:00 2001 From: oEmbedler Inc Date: Tue, 12 Apr 2016 20:46:10 +0100 Subject: [PATCH] Fix potential NPE in RedisAutoConfiguration Closes gh-5667 --- .../boot/autoconfigure/data/redis/RedisAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java index ddc765a1ff..73f3025f0c 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java @@ -125,7 +125,7 @@ public class RedisAutoConfiguration { clusterProperties.getNodes()); if (clusterProperties.getMaxRedirects() != null) { - config.setMaxRedirects(config.getMaxRedirects()); + config.setMaxRedirects(clusterProperties.getMaxRedirects()); } return config; }