From 85f2e0489f30bf8ab598150d903f060544c593ea Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 08:31:45 -0500 Subject: [PATCH] Cache user authenticator threads diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java index 2f6d79b03..89a11a496 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -93,6 +93,12 @@ public class LoginListener implements PacketLoginInListener, ITickable { } + // Paper start - Cache authenticator threads + private static final AtomicInteger threadId = new AtomicInteger(0); + private static final java.util.concurrent.ExecutorService authenticatorPool = java.util.concurrent.Executors.newCachedThreadPool( + r -> new Thread(r, "User Authenticator #" + threadId.incrementAndGet()) + ); + // Paper end // Spigot start public void initUUID() { @@ -169,8 +175,8 @@ public class LoginListener implements PacketLoginInListener, ITickable { this.networkManager.sendPacket(new PacketLoginOutEncryptionBegin("", this.server.G().getPublic(), this.e)); } else { // Spigot start - new Thread("User Authenticator #" + LoginListener.b.incrementAndGet()) { - + // Paper start - Cache authenticator threads + authenticatorPool.execute(new Runnable() { @Override public void run() { try { @@ -182,7 +188,8 @@ public class LoginListener implements PacketLoginInListener, ITickable { server.server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + i.getName(), ex); } } - }.start(); + }); + // Paper end // Spigot end } @@ -198,7 +205,8 @@ public class LoginListener implements PacketLoginInListener, ITickable { this.loginKey = packetlogininencryptionbegin.a(privatekey); this.g = LoginListener.EnumProtocolState.AUTHENTICATING; this.networkManager.a(this.loginKey); - Thread thread = new Thread("User Authenticator #" + LoginListener.b.incrementAndGet()) { + // Paper start - Cache authenticator threads + authenticatorPool.execute(new Runnable() { public void run() { GameProfile gameprofile = LoginListener.this.i; @@ -245,10 +253,8 @@ public class LoginListener implements PacketLoginInListener, ITickable { return LoginListener.this.server.U() && socketaddress instanceof InetSocketAddress ? ((InetSocketAddress) socketaddress).getAddress() : null; } - }; - - thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(LoginListener.c)); - thread.start(); + }); + // Paper end } } -- 2.18.0