From 5005a191951a03fd33a31a0a3f10fa8ee0b5a82f Mon Sep 17 00:00:00 2001 From: Sotr Date: Fri, 10 Aug 2018 22:01:24 +0800 Subject: [PATCH] Hopefully fixes dead lock --- .../io/akarin/api/internal/utils/ReentrantSpinningLock.java | 6 +----- work/Paper | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sources/src/main/java/io/akarin/api/internal/utils/ReentrantSpinningLock.java b/sources/src/main/java/io/akarin/api/internal/utils/ReentrantSpinningLock.java index 98b69594c..112b00422 100644 --- a/sources/src/main/java/io/akarin/api/internal/utils/ReentrantSpinningLock.java +++ b/sources/src/main/java/io/akarin/api/internal/utils/ReentrantSpinningLock.java @@ -8,14 +8,10 @@ public class ReentrantSpinningLock { public void lock() { long currentThreadId = Thread.currentThread().getId(); - attemptLock.getAndSet(true); // In case acquire one lock concurrently - if (heldThreadId != 0 && heldThreadId != currentThreadId) { - attemptLock.set(false); while (heldThreadId != 0) ; // The current thread is spinning here - attemptLock.getAndSet(true); } - + attemptLock.getAndSet(true); // In case acquire one lock concurrently heldThreadId = currentThreadId; attemptLock.set(false); } diff --git a/work/Paper b/work/Paper index 1f3ad09e1..98b996cf4 160000 --- a/work/Paper +++ b/work/Paper @@ -1 +1 @@ -Subproject commit 1f3ad09e1503c12a762350aec43fb1196c3192c9 +Subproject commit 98b996cf40831c2d6cc0453b77d292da7503d0bc