Commit 1c6bcc12 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #20832 from dreis2211

* pr/20832:
  Update copyright year
  Fix WebappLoader constructor deprecations

Closes gh-20832
parents a2c67cd5 cb66e4a2
...@@ -149,7 +149,7 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac ...@@ -149,7 +149,7 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
context.addLifecycleListener(new Tomcat.FixContextListener()); context.addLifecycleListener(new Tomcat.FixContextListener());
context.setParentClassLoader(ClassUtils.getDefaultClassLoader()); context.setParentClassLoader(ClassUtils.getDefaultClassLoader());
skipAllTldScanning(context); skipAllTldScanning(context);
WebappLoader loader = new WebappLoader(context.getParentClassLoader()); WebappLoader loader = new WebappLoader();
loader.setLoaderClass(TomcatEmbeddedWebappClassLoader.class.getName()); loader.setLoaderClass(TomcatEmbeddedWebappClassLoader.class.getName());
loader.setDelegate(true); loader.setDelegate(true);
context.setLoader(loader); context.setLoader(loader);
......
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -222,7 +222,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto ...@@ -222,7 +222,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
// Tomcat is < 8.5.39. Continue. // Tomcat is < 8.5.39. Continue.
} }
configureTldSkipPatterns(context); configureTldSkipPatterns(context);
WebappLoader loader = new WebappLoader(context.getParentClassLoader()); WebappLoader loader = new WebappLoader();
loader.setLoaderClass(TomcatEmbeddedWebappClassLoader.class.getName()); loader.setLoaderClass(TomcatEmbeddedWebappClassLoader.class.getName());
loader.setDelegate(true); loader.setDelegate(true);
context.setLoader(loader); context.setLoader(loader);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment