Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2018-03-12 15:40:50 +01:00
commit bb25b0a1f4

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -52,13 +52,10 @@ class RedisSessionConfiguration {
public static class SpringBootRedisHttpSessionConfiguration public static class SpringBootRedisHttpSessionConfiguration
extends RedisHttpSessionConfiguration { extends RedisHttpSessionConfiguration {
private SessionProperties sessionProperties;
@Autowired @Autowired
public void customize(SessionProperties sessionProperties, public void customize(SessionProperties sessionProperties,
RedisSessionProperties redisSessionProperties) { RedisSessionProperties redisSessionProperties) {
this.sessionProperties = sessionProperties; Duration timeout = sessionProperties.getTimeout();
Duration timeout = this.sessionProperties.getTimeout();
if (timeout != null) { if (timeout != null) {
setMaxInactiveIntervalInSeconds((int) timeout.getSeconds()); setMaxInactiveIntervalInSeconds((int) timeout.getSeconds());
} }