GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Prevent concurrency issues with SkinProvider#requestedSkins

Browse source 
There is a small potential here to return null if containsKey runs before remove and then get is called.
This commit is contained in:
Camotoy 2021-09-10 16:32:09 -04:00
parent b69cc8eba5
commit 3632ebda8b
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
connector/src/main/java/org/geysermc/connector/skin/SkinProvider.java
View file

@ -163,7 +163,11 @@ public class SkinProvider {
public static CompletableFuture<Skin> requestSkin(UUID playerId, String textureUrl, boolean newThread) {
if (textureUrl == null || textureUrl.isEmpty()) return CompletableFuture.completedFuture(EMPTY_SKIN);
if (requestedSkins.containsKey(textureUrl)) return requestedSkins.get(textureUrl); // already requested
CompletableFuture<Skin> requestedSkin = requestedSkins.get(textureUrl);
if (requestedSkin != null) {
// already requested
return requestedSkin;
}
Skin cachedSkin = getCachedSkin(textureUrl);
if (cachedSkin != null) {