Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-15 11:51:53 +01:00
Code Issues Projects Releases Wiki Activity

fix: drain worker queue during worker shutdown

Browse Source
This commit is contained in:
mworzala 2024-02-21 13:39:25 -05:00
parent b0f811d5ba
commit b58db7d5b0
No known key found for this signature in database
GPG Key ID: B148F922E64797C7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minestom/server/network/socket/Worker.java
View File

@ -9,6 +9,8 @@ import net.minestom.server.utils.binary.BinaryBuffer;
import org.jctools.queues.MessagePassingQueue;
import org.jctools.queues.MpscUnboundedXaddArrayQueue;
import org.jetbrains.annotations.ApiStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.InetSocketAddress;
@ -19,8 +21,6 @@ import java.nio.channels.SocketChannel;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ApiStatus.Internal
public final class Worker extends MinestomThread {
@ -48,6 +48,11 @@ public final class Worker extends MinestomThread {
}
public void close() {
try {
this.queue.drain(Runnable::run);
} catch (Exception e) {
MinecraftServer.getExceptionManager().handleException(e);
}
this.selector.wakeup();
try {
this.selector.close();