Fix potential NPE in RedisAutoConfiguration

oEmbedler Inc · philwebb · commit af39d558ff5c · 2016-04-12T14:51:18.000-07:00
Closes spring-projectsgh-5667
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
@@ -125,7 +125,7 @@ protected final RedisClusterConfiguration getClusterConfiguration() {
 					clusterProperties.getNodes());
 
 			if (clusterProperties.getMaxRedirects() != null) {
-				config.setMaxRedirects(config.getMaxRedirects());
+				config.setMaxRedirects(clusterProperties.getMaxRedirects());
 			}
 			return config;
 		}

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ protected final RedisClusterConfiguration getClusterConfiguration() {`
`125`	`125`	`clusterProperties.getNodes());`
`126`	`126`
`127`	`127`	`if (clusterProperties.getMaxRedirects() != null) {`
`128`		`- config.setMaxRedirects(config.getMaxRedirects());`
	`128`	`+ config.setMaxRedirects(clusterProperties.getMaxRedirects());`
`129`	`129`	`}`
`130`	`130`	`return config;`
`131`	`131`	`}`