Browse Source

Merge pull request #5667 from oembedler/master

* pull5667:
  Fix potential NPE in RedisAutoConfiguration
pull/5672/head
Phillip Webb 10 years ago
parent
commit
dacf0f9826
  1. 2
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java

@ -125,7 +125,7 @@ public class RedisAutoConfiguration { @@ -125,7 +125,7 @@ public class RedisAutoConfiguration {
clusterProperties.getNodes());
if (clusterProperties.getMaxRedirects() != null) {
config.setMaxRedirects(config.getMaxRedirects());
config.setMaxRedirects(clusterProperties.getMaxRedirects());
}
return config;
}

Loading…
Cancel
Save