Merge pull request #1721 from randomSpirit/master

in case timeoutValue is null
6 years ago · b764fef7d3
parent 52685c144d 39eba7f314
commit b764fef7d3
1 changed files with 3 additions and 1 deletions
--- a/redisson-spring-boot-starter/src/main/java/org/redisson/spring/starter/RedissonAutoConfiguration.java
+++ b/redisson-spring-boot-starter/src/main/java/org/redisson/spring/starter/RedissonAutoConfiguration.java
@ -74,7 +74,9 @@ public class RedissonAutoConfiguration {
        Method timeoutMethod = ReflectionUtils.findMethod(RedisProperties.class, "getTimeout");
        Object timeoutValue = ReflectionUtils.invokeMethod(timeoutMethod, redisProperties);
        int timeout;
-        if (!(timeoutValue instanceof Integer)) {
+        if(null == timeoutValue){
+            timeout = 0;
+        }else if (!(timeoutValue instanceof Integer)) {
            Method millisMethod = ReflectionUtils.findMethod(timeoutValue.getClass(), "toMillis");
            timeout = ((Long) ReflectionUtils.invokeMethod(millisMethod, timeoutValue)).intValue();
        } else {