Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
d8cead54
Commit
d8cead54
authored
Apr 01, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use accessor for in-progress async count added in Tomcat 9.0.33
Closes gh-20440
parent
281f4d4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
7 deletions
+2
-7
TomcatGracefulShutdown.java
...work/boot/web/embedded/tomcat/TomcatGracefulShutdown.java
+2
-7
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java
View file @
d8cead54
...
@@ -16,22 +16,20 @@
...
@@ -16,22 +16,20 @@
package
org
.
springframework
.
boot
.
web
.
embedded
.
tomcat
;
package
org
.
springframework
.
boot
.
web
.
embedded
.
tomcat
;
import
java.lang.reflect.Field
;
import
java.time.Duration
;
import
java.time.Duration
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.concurrent.atomic.AtomicLong
;
import
org.apache.catalina.Container
;
import
org.apache.catalina.Container
;
import
org.apache.catalina.Service
;
import
org.apache.catalina.Service
;
import
org.apache.catalina.connector.Connector
;
import
org.apache.catalina.connector.Connector
;
import
org.apache.catalina.core.StandardContext
;
import
org.apache.catalina.core.StandardWrapper
;
import
org.apache.catalina.core.StandardWrapper
;
import
org.apache.catalina.startup.Tomcat
;
import
org.apache.catalina.startup.Tomcat
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.apache.commons.logging.LogFactory
;
import
org.springframework.boot.web.server.GracefulShutdown
;
import
org.springframework.boot.web.server.GracefulShutdown
;
import
org.springframework.util.ReflectionUtils
;
/**
/**
* {@link GracefulShutdown} for {@link Tomcat}.
* {@link GracefulShutdown} for {@link Tomcat}.
...
@@ -90,10 +88,7 @@ class TomcatGracefulShutdown implements GracefulShutdown {
...
@@ -90,10 +88,7 @@ class TomcatGracefulShutdown implements GracefulShutdown {
private
boolean
active
(
Container
context
)
{
private
boolean
active
(
Container
context
)
{
try
{
try
{
Field
field
=
ReflectionUtils
.
findField
(
context
.
getClass
(),
"inProgressAsyncCount"
);
if
(((
StandardContext
)
context
).
getInProgressAsyncCount
()
>
0
)
{
field
.
setAccessible
(
true
);
AtomicLong
inProgressAsyncCount
=
(
AtomicLong
)
field
.
get
(
context
);
if
(
inProgressAsyncCount
.
get
()
>
0
)
{
return
true
;
return
true
;
}
}
for
(
Container
wrapper
:
context
.
findChildren
())
{
for
(
Container
wrapper
:
context
.
findChildren
())
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment