Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove TomcatEmbeddedContext.overrideLoadOnStart

Browse Source 
Remove the reflection tests used to support the older variant of
`overrideLoadOnStart` that returned a void. Since we no longer support
that older version we can simply the code.

Closes gh-14789
This commit is contained in:
Phillip Webb
2018-10-11 20:22:58 -07:00
parent 74d48fb7a7
commit 3da25c6d36
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ import org.apache.catalina.session.ManagerBase;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
/**
* Tomcat {@link StandardContext} used by {@link TomcatWebServer} to support deferred
@@ -37,20 +36,10 @@ class TomcatEmbeddedContext extends StandardContext {
private TomcatStarter starter;
private final boolean overrideLoadOnStart;
TomcatEmbeddedContext() {
this.overrideLoadOnStart = ReflectionUtils
.findMethod(StandardContext.class, "loadOnStartup", Container[].class)
.getReturnType() == boolean.class;
}
@Override
public boolean loadOnStartup(Container[] children) {
if (this.overrideLoadOnStart) {
return true;
}
return super.loadOnStartup(children);
// deferred until later (see deferredLoadOnStartup)
return true;
}
@Override
@@ -73,14 +62,8 @@ class TomcatEmbeddedContext extends StandardContext {
existingLoader = ClassUtils.overrideThreadContextClassLoader(classLoader);
}
try {
if (this.overrideLoadOnStart) {
// Earlier versions of Tomcat used a version that returned void. If that
// version is used our overridden loadOnStart method won't have been
// called and the original will have already run.
boolean started = super.loadOnStartup(findChildren());
Assert.state(started,
"Unable to start embedded tomcat context " + getName());
}
boolean started = super.loadOnStartup(findChildren());
Assert.state(started, "Unable to start embedded tomcat context " + getName());
}
finally {
if (existingLoader != null) {