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

Use accessor for in-progress async count added in Tomcat 9.0.33

Browse Source 
Closes gh-20440
This commit is contained in:
Andy Wilkinson
2020-04-01 11:16:54 +01:00
parent 281f4d4ceb
commit d8cead5457
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,22 +16,20 @@
package org.springframework.boot.web.embedded.tomcat;
import java.lang.reflect.Field;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.catalina.Container;
import org.apache.catalina.Service;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardWrapper;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.web.server.GracefulShutdown;
import org.springframework.util.ReflectionUtils;
/**
* {@link GracefulShutdown} for {@link Tomcat}.
@@ -90,10 +88,7 @@ class TomcatGracefulShutdown implements GracefulShutdown {
private boolean active(Container context) {
try {
Field field = ReflectionUtils.findField(context.getClass(), "inProgressAsyncCount");
field.setAccessible(true);
AtomicLong inProgressAsyncCount = (AtomicLong) field.get(context);
if (inProgressAsyncCount.get() > 0) {
if (((StandardContext) context).getInProgressAsyncCount() > 0) {
return true;
}
for (Container wrapper : context.findChildren()) {