Merge pull request #5667 from oembedler/master

* pull5667: Fix potential NPE in RedisAutoConfiguration
2016-04-12 14:52:57 -07:00 · 2016-04-12 14:52:57 -07:00 · dacf0f9826
parent 6eeda76af7 af39d558ff
commit dacf0f9826
1 changed files with 1 additions and 1 deletions
--- 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;
 		}