From b33bbd56e7910efd1dafeff55d0b4e686d8c978b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 8 Dec 2014 21:36:39 -0800 Subject: [PATCH] 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 --- .../AbstractConfigurableEmbeddedServletContainer.java | 4 ++-- .../AbstractEmbeddedServletContainerFactoryTests.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java index 8e2c7d85f0..191076ed0f 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java @@ -37,8 +37,8 @@ import org.springframework.util.Assert; public abstract class AbstractConfigurableEmbeddedServletContainer implements ConfigurableEmbeddedServletContainer { - private static final int DEFAULT_SESSION_TIMEOUT = (int) TimeUnit.SECONDS - .toMinutes(30); + private static final int DEFAULT_SESSION_TIMEOUT = (int) TimeUnit.MINUTES + .toSeconds(30); private String contextPath = ""; diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java index 268a7c1e85..66941a4c00 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java @@ -534,6 +534,11 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { equalTo("test")); } + @Test + public void defaultSessionTimeout() throws Exception { + assertThat(getFactory().getSessionTimeout(), equalTo(30 * 60)); + } + protected String getLocalUrl(String resourcePath) { return getLocalUrl("http", resourcePath); }