From 048e964b41e6597750ca17e1d623da85d9b4595c Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Sat, 26 Nov 2016 22:06:23 -0600 Subject: [PATCH] Fix double lock in ServerConnection --- .../Avoid-blocking-on-Network-Manager-creation.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch index 505e76fa8..9bc3d55ee 100644 --- a/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch +++ b/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch @@ -17,10 +17,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + private final List pending = Collections.synchronizedList(Lists.newArrayList()); + private void addPending() { + synchronized (pending) { -+ synchronized (this.h) { // Paper - OBFHELPER - List of network managers -+ this.h.addAll(pending); -+ pending.clear(); -+ } ++ this.h.addAll(pending); // Paper - OBFHELPER - List of network managers ++ pending.clear(); + } + } + // Paper end