13
0
geforkt von Mirrors/Velocity

Fire ProxyShutdownEvent before closing the scheduler / event bus

Fixes #322
Dieser Commit ist enthalten in:
Luck 2020-06-29 15:48:28 +01:00 committet von Andrew Steinborn
Ursprung 7fd76962f2
Commit ea52cedfdf

Datei anzeigen

@ -403,6 +403,8 @@ public class VelocityServer implements ProxyServer {
timedOut = true; timedOut = true;
} }
eventManager.fireShutdownEvent();
timedOut = !eventManager.shutdown() || timedOut; timedOut = !eventManager.shutdown() || timedOut;
timedOut = !scheduler.shutdown() || timedOut; timedOut = !scheduler.shutdown() || timedOut;
@ -414,8 +416,6 @@ public class VelocityServer implements ProxyServer {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
eventManager.fireShutdownEvent();
shutdown = true; shutdown = true;
if (explicitExit) { if (explicitExit) {