Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #3929 - Deadlock between new HTTP2Connection() and Server.stop(). 

Previously beans were started if they were not running, which
included them being in a STOPPING state.
Now beans are only started if they are in STOPPED state.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2019-08-05 21:08:55 +02:00
parent ab015f2653
commit 6c1b5982a5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java
View File

@ -106,18 +106,20 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
switch (b._managed) switch (b._managed)
{ {
case MANAGED: case MANAGED:
if (!l.isRunning()) if (l.isStopped())
start(l); start(l);
break; break;
case AUTO: case AUTO:
if (l.isRunning()) if (l.isStopped())
unmanage(b);
else
{ {
manage(b); manage(b);
start(l); start(l);
} }
else
{
unmanage(b);
}
break; break;
default: default:
@ -142,7 +144,7 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
{ {
try try
{ {
l.stop(); stop(l);
} }
catch (Throwable cause2) catch (Throwable cause2)
{ {