mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-03-07 13:48:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use a Guava Cache instead of a ThreadLocal (#1859)"

Browse Source 
This reverts commit b9f0416624.
This commit is contained in:
Madeline Miller 2021-08-22 13:45:33 +10:00
parent ed28089628
commit f049d5613f
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
worldedit-core/src/main/java/com/sk89q/worldedit/session/request/Request.java
View File

@ -19,9 +19,6 @@
package com.sk89q.worldedit.session.request;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.world.World;
@ -29,14 +26,11 @@
import javax.annotation.Nullable;
/**
* Describes the current request.
* Describes the current request using a {@link ThreadLocal}.
*/
public final class Request {
private static final LoadingCache<Thread, Request> THREAD_TO_REQUEST =
CacheBuilder.newBuilder()
.weakKeys()
.build(CacheLoader.from(Request::new));
private static final ThreadLocal<Request> threadLocal = ThreadLocal.withInitial(Request::new);
private @Nullable World world;
private @Nullable LocalSession session;
@ -106,7 +100,7 @@ public void setEditSession(@Nullable EditSession editSession) {
* @return the current request
*/
public static Request request() {
return THREAD_TO_REQUEST.getUnchecked(Thread.currentThread());
return threadLocal.get();
}
/**
@ -114,7 +108,7 @@ public static Request request() {
*/
public static void reset() {
request().invalidate();
THREAD_TO_REQUEST.invalidate(Thread.currentThread());
threadLocal.remove();
}
/**