From dd465b7f7972408bc030b4b33afdfaa35cc8a551 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 18 Aug 2016 14:23:33 +0100 Subject: [PATCH] Fix configuration of session ID generator on Tomcat 7 See gh-6679 --- .../boot/context/embedded/tomcat/TomcatEmbeddedContext.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java index 857e42cdcf3..7e778bce6c1 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java @@ -19,6 +19,7 @@ package org.springframework.boot.context.embedded.tomcat; import org.apache.catalina.Container; import org.apache.catalina.Manager; import org.apache.catalina.core.StandardContext; +import org.apache.catalina.session.ManagerBase; import org.springframework.util.ClassUtils; import org.springframework.util.ReflectionUtils; @@ -52,8 +53,8 @@ class TomcatEmbeddedContext extends StandardContext { @Override public void setManager(Manager manager) { - if (manager != null) { - manager.setSessionIdGenerator(new LazySessionIdGenerator()); + if (manager instanceof ManagerBase) { + ((ManagerBase) manager).setSessionIdGenerator(new LazySessionIdGenerator()); } super.setManager(manager); }