Skip to content

Commit 06028f8

Browse files
Rudy Adamssnicoll
authored andcommitted
Polish embedded tomcat setup
See gh-16446
1 parent 7587af3 commit 06028f8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public boolean loadOnStartup(Container[] children) {
5555
@Override
5656
public void setManager(Manager manager) {
5757
if (manager instanceof ManagerBase) {
58-
((ManagerBase) manager).setSessionIdGenerator(new LazySessionIdGenerator());
58+
manager.setSessionIdGenerator(new LazySessionIdGenerator());
5959
}
6060
super.setManager(manager);
6161
}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
6666

6767
private File baseDirectory;
6868

69-
private List<Valve> engineValves = new ArrayList<>();
69+
private final List<Valve> engineValves = new ArrayList<>();
7070

7171
private List<LifecycleListener> contextLifecycleListeners = getDefaultLifecycleListeners();
7272

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
121121

122122
private List<TomcatProtocolHandlerCustomizer<?>> tomcatProtocolHandlerCustomizers = new ArrayList<>();
123123

124-
private List<Connector> additionalTomcatConnectors = new ArrayList<>();
124+
private final List<Connector> additionalTomcatConnectors = new ArrayList<>();
125125

126126
private ResourceLoader resourceLoader;
127127

@@ -717,7 +717,7 @@ public void lifecycleEvent(LifecycleEvent event) {
717717
if (event.getType().equals(Lifecycle.START_EVENT)) {
718718
Context context = (Context) event.getLifecycle();
719719
Manager manager = context.getManager();
720-
if (manager != null && manager instanceof StandardManager) {
720+
if (manager instanceof StandardManager) {
721721
((StandardManager) manager).setPathname(null);
722722
}
723723
}

0 commit comments

Comments
 (0)