Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x' into 2.3.x

Browse Source 
Closes gh-23750
This commit is contained in:
Andy Wilkinson 2020-10-19 14:32:23 +01:00
commit a754b791a2
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -22,8 +22,6 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import javax.annotation.PostConstruct;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.web.ServerProperties;
@ -64,13 +62,6 @@ public class SessionProperties {
this.serverProperties = serverProperties.getIfUnique();
}
@PostConstruct
public void checkSessionTimeout() {
if (this.timeout == null && this.serverProperties != null) {
this.timeout = this.serverProperties.getServlet().getSession().getTimeout();
}
}
public StoreType getStoreType() {
return this.storeType;
}
@ -85,7 +76,8 @@ public class SessionProperties {
* @see Session#getTimeout()
*/
public Duration getTimeout() {
return this.timeout;
return (this.timeout == null && this.serverProperties != null)
? this.serverProperties.getServlet().getSession().getTimeout() : this.timeout;
}
public void setTimeout(Duration timeout) {