mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix double lock in ServerConnection

Browse source
This commit is contained in:
Alfie Cleveland 2016-11-26 22:06:23 -06:00
commit 048e964b41
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch
View file

@ -17,10 +17,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ private final List<NetworkManager> pending = Collections.synchronizedList(Lists.<NetworkManager>newArrayList()); + private final List<NetworkManager> pending = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
+ private void addPending() { + private void addPending() {
+ synchronized (pending) { + synchronized (pending) {
+ synchronized (this.h) { // Paper - OBFHELPER - List of network managers + this.h.addAll(pending); // Paper - OBFHELPER - List of network managers
+ this.h.addAll(pending); + pending.clear();
+ pending.clear();
+ }
+ } + }
+ } + }
+ // Paper end + // Paper end