Skip to content

Commit 1c031ab

Browse files
committed
Fix session timeout default value
Update DEFAULT_SESSION_TIMEOUT to use TimeUnit.MINUTES.toSeconds(30) rather than TimeUnit.SECONDS.toMinutes(30) which would always return 0. See gh-2084 (cherry picked from commit b33bbd5)
1 parent c23a764 commit 1c031ab

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
public abstract class AbstractConfigurableEmbeddedServletContainer implements
3838
ConfigurableEmbeddedServletContainer {
3939

40-
private static final int DEFAULT_SESSION_TIMEOUT = (int) TimeUnit.SECONDS
41-
.toMinutes(30);
40+
private static final int DEFAULT_SESSION_TIMEOUT = (int) TimeUnit.MINUTES
41+
.toSeconds(30);
4242

4343
private String contextPath = "";
4444

spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,11 @@ public void sslWantsClientAuthenticationSucceedsWithoutClientCertificate()
530530
equalTo("test"));
531531
}
532532

533+
@Test
534+
public void defaultSessionTimeout() throws Exception {
535+
assertThat(getFactory().getSessionTimeout(), equalTo(30 * 60));
536+
}
537+
533538
protected String getLocalUrl(String resourcePath) {
534539
return getLocalUrl("http", resourcePath);
535540
}

0 commit comments

Comments
 (0)