PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-29 07:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix race condition where one server will respond first if it happens to be faster.

Browse source
This commit is contained in:
Matthew Messinger 2018-01-02 03:02:08 -05:00
parent b0e30dbcdc
commit 2c592768d3
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/hdskins/java/com/voxelmodpack/hdskins/skins/AbstractSkinServer.java
View file

@ -1,5 +1,6 @@
package com.voxelmodpack.hdskins.skins; package com.voxelmodpack.hdskins.skins;
import com.google.common.base.Preconditions;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
@ -22,8 +23,6 @@ public abstract class AbstractSkinServer implements SkinServer {
protected static final ExecutorService skinDownloadExecutor = Executors.newCachedThreadPool(); protected static final ExecutorService skinDownloadExecutor = Executors.newCachedThreadPool();
protected static final ListeningExecutorService skinUploadExecutor = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor()); protected static final ListeningExecutorService skinUploadExecutor = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor());
public static final MinecraftTexturesPayload EMPTY_PAYLOAD = new MinecraftTexturesPayload();
private LoadingCache<GameProfile, Optional<MinecraftTexturesPayload>> skins = CacheBuilder.newBuilder() private LoadingCache<GameProfile, Optional<MinecraftTexturesPayload>> skins = CacheBuilder.newBuilder()
.initialCapacity(20) .initialCapacity(20)
.maximumSize(100) .maximumSize(100)
@ -32,7 +31,11 @@ public abstract class AbstractSkinServer implements SkinServer {
@Override @Override
public Optional<MinecraftTexturesPayload> load(GameProfile key) { public Optional<MinecraftTexturesPayload> load(GameProfile key) {
return loadProfileData(key); Preconditions.checkNotNull(key, "profile cannot be null");
// prevent race condition where one server responds faster than the previous one
synchronized (key) {
return loadProfileData(key);
}
} }
}, Optional.empty(), skinDownloadExecutor)); }, Optional.empty(), skinDownloadExecutor));
@ -40,7 +43,6 @@ public abstract class AbstractSkinServer implements SkinServer {
@Override @Override
public final Optional<MinecraftTexturesPayload> getProfileData(GameProfile profile) { public final Optional<MinecraftTexturesPayload> getProfileData(GameProfile profile) {
boolean was = !skins.asMap().containsKey(profile); boolean was = !skins.asMap().containsKey(profile);
Optional<MinecraftTexturesPayload> textures = skins.getUnchecked(profile); Optional<MinecraftTexturesPayload> textures = skins.getUnchecked(profile);
// This is the initial value. Refreshing will load it syncronously. // This is the initial value. Refreshing will load it syncronously.