Skip to content

Commit 1c6bcc1

Browse files
committed
Merge pull request #20832 from dreis2211
* pr/20832: Update copyright year Fix WebappLoader constructor deprecations Closes gh-20832
2 parents a2c67cd + cb66e4a commit 1c6bcc1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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
@@ -149,7 +149,7 @@ protected void prepareContext(Host host, TomcatHttpHandlerAdapter servlet) {
149149
context.addLifecycleListener(new Tomcat.FixContextListener());
150150
context.setParentClassLoader(ClassUtils.getDefaultClassLoader());
151151
skipAllTldScanning(context);
152-
WebappLoader loader = new WebappLoader(context.getParentClassLoader());
152+
WebappLoader loader = new WebappLoader();
153153
loader.setLoaderClass(TomcatEmbeddedWebappClassLoader.class.getName());
154154
loader.setDelegate(true);
155155
context.setLoader(loader);

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
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -222,7 +222,7 @@ protected void prepareContext(Host host, ServletContextInitializer[] initializer
222222
// Tomcat is < 8.5.39. Continue.
223223
}
224224
configureTldSkipPatterns(context);
225-
WebappLoader loader = new WebappLoader(context.getParentClassLoader());
225+
WebappLoader loader = new WebappLoader();
226226
loader.setLoaderClass(TomcatEmbeddedWebappClassLoader.class.getName());
227227
loader.setDelegate(true);
228228
context.setLoader(loader);

0 commit comments

Comments
 (0)