Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-04 04:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #8536 HotSwap start race (#8544)

Browse Source 
Don't stop until after new handler installed.
This commit is contained in:
Greg Wilkins 2022-09-23 16:54:21 +10:00 committed by GitHub
parent 2ebc4d8223
commit 47c289188e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java
View File

@ -65,10 +65,20 @@ public class HotSwapHandler extends AbstractHandlerContainer
try try
{ {
Server server = getServer(); Server server = getServer();
if (handler == _handler)
return;
Handler oldHandler = _handler;
if (handler != null) if (handler != null)
{
handler.setServer(server); handler.setServer(server);
updateBean(_handler, handler, true); addBean(handler, true);
if (oldHandler != null && oldHandler.isStarted())
handler.start();
}
_handler = handler; _handler = handler;
if (oldHandler != null)
removeBean(oldHandler);
} }
catch (Exception e) catch (Exception e)
{ {