Fix race condition making it possible to return a non-ready future fr…

…om BlueNBT
BlueMap-Minecraft · Jul 26, 2024 · 147e981 · 147e981
1 parent ce2be84
commit 147e981
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/de/bluecolored/bluenbt/BlueNBT.java b/src/main/java/de/bluecolored/bluenbt/BlueNBT.java
@@ -165,7 +165,7 @@ public <U> Optional<? extends InstanceCreator<U>> create(TypeToken<U> createType
     @SuppressWarnings("unchecked")
     public <T> TypeSerializer<T> getTypeSerializer(TypeToken<T> type) {
         TypeSerializer<T> serializer = (TypeSerializer<T>) typeSerializerMap.get(type);
-        if (serializer != null) return serializer;
+        if (serializer != null && (!(serializer instanceof FutureTypeSerializer))) return serializer;
 
         synchronized (this) {
             serializer = (TypeSerializer<T>) typeSerializerMap.get(type);
@@ -196,7 +196,7 @@ public <T> TypeSerializer<T> getTypeSerializer(TypeToken<T> type) {
     @SuppressWarnings("unchecked")
     public <T> TypeDeserializer<T> getTypeDeserializer(TypeToken<T> type) {
         TypeDeserializer<T> deserializer = (TypeDeserializer<T>) typeDeserializerMap.get(type);
-        if (deserializer != null) return deserializer;
+        if (deserializer != null && (!(deserializer instanceof FutureTypeDeserializer))) return deserializer;
 
         synchronized (this) {
             deserializer = (TypeDeserializer<T>) typeDeserializerMap.get(type);
@@ -227,7 +227,7 @@ public <T> TypeDeserializer<T> getTypeDeserializer(TypeToken<T> type) {
     @SuppressWarnings("unchecked")
     public <T> InstanceCreator<T> getInstanceCreator(TypeToken<T> type) {
         InstanceCreator<T> instanceCreator = (InstanceCreator<T>) instanceCreatorMap.get(type);
-        if (instanceCreator != null) return instanceCreator;
+        if (instanceCreator != null && (!(instanceCreator instanceof FutureInstanceCreator))) return instanceCreator;
 
         synchronized (this) {
             instanceCreator = (InstanceCreator<T>) instanceCreatorMap.get(type);