From 1c031abdd2ad437b066241769b2a375acee4eed6 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 (cherry picked from commit b33bbd56) --- .../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 e29af11a8bf..ae57dbc7747 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 2850624d4dd..84b386f0efd 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 @@ -530,6 +530,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); }