See gh-12906
This commit is contained in:
Stephane Nicoll
2018-04-28 10:36:41 +02:00
parent c7a11e1192
commit 22b99a90de
2 changed files with 7 additions and 7 deletions

View File

@@ -65,8 +65,7 @@ public class SessionProperties {
@PostConstruct
public void checkSessionTimeout() {
if (this.timeout == null && this.serverProperties != null) {
Session session = this.serverProperties.getServlet().getSession();
this.timeout = (session == null ? null : session.getTimeout());
this.timeout = this.serverProperties.getServlet().getSession().getTimeout();
}
}
@@ -87,6 +86,10 @@ public class SessionProperties {
return this.timeout;
}
public void setTimeout(Duration timeout) {
this.timeout = timeout;
}
public Servlet getServlet() {
return this.servlet;
}
@@ -95,10 +98,6 @@ public class SessionProperties {
this.servlet = servlet;
}
public void setTimeout(Duration timeout) {
this.timeout = timeout;
}
/**
* Servlet-related properties.
*/