From 06028f83b2d25579fb7f6b27f08eb2ff8ba64720 Mon Sep 17 00:00:00 2001 From: Rudy Adams Date: Wed, 3 Apr 2019 20:28:16 +0200 Subject: [PATCH 1/2] Polish embedded tomcat setup See gh-16446 --- .../boot/web/embedded/tomcat/TomcatEmbeddedContext.java | 2 +- .../web/embedded/tomcat/TomcatReactiveWebServerFactory.java | 2 +- .../web/embedded/tomcat/TomcatServletWebServerFactory.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java index edb96a655b..8490c9647c 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java @@ -55,7 +55,7 @@ class TomcatEmbeddedContext extends StandardContext { @Override public void setManager(Manager manager) { if (manager instanceof ManagerBase) { - ((ManagerBase) manager).setSessionIdGenerator(new LazySessionIdGenerator()); + manager.setSessionIdGenerator(new LazySessionIdGenerator()); } super.setManager(manager); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java index cb97180cf9..c008726ba1 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java @@ -66,7 +66,7 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac private File baseDirectory; - private List engineValves = new ArrayList<>(); + private final List engineValves = new ArrayList<>(); private List contextLifecycleListeners = getDefaultLifecycleListeners(); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java index 7b0e9eb653..9e0fdbd985 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java @@ -121,7 +121,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto private List> tomcatProtocolHandlerCustomizers = new ArrayList<>(); - private List additionalTomcatConnectors = new ArrayList<>(); + private final List additionalTomcatConnectors = new ArrayList<>(); private ResourceLoader resourceLoader; @@ -717,7 +717,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto if (event.getType().equals(Lifecycle.START_EVENT)) { Context context = (Context) event.getLifecycle(); Manager manager = context.getManager(); - if (manager != null && manager instanceof StandardManager) { + if (manager instanceof StandardManager) { ((StandardManager) manager).setPathname(null); } } From dbf8245c1d920570e0713a494d59b431be7810b9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 5 Apr 2019 08:43:51 +0200 Subject: [PATCH 2/2] Polish "Polish embedded tomcat setup" Closes gh-16446 --- .../boot/web/embedded/tomcat/TomcatEmbeddedContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java index 8490c9647c..39d022932a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.