wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FullDataMetaFile load not returning if an error occured

Browse Source
This commit is contained in:
James Seibel
2023-09-17 16:08:16 -05:00
parent b4fe07643e
commit bc0437f78a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataMetaFile.java
+6 -1
View File
@@ -42,6 +42,7 @@ import com.seibel.distanthorizons.core.pos.DhLodPos;
import com.seibel.distanthorizons.core.pos.DhSectionPos;
import com.seibel.distanthorizons.core.dataObjects.fullData.loader.AbstractFullDataSourceLoader;
import com.seibel.distanthorizons.core.util.AtomicsUtil;
import com.seibel.distanthorizons.core.util.FileUtil;
import com.seibel.distanthorizons.core.util.LodUtil;
import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream;
import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
@@ -185,7 +186,7 @@ public class FullDataMetaFile extends AbstractMetaDataContainerFile implements I
CompletableFuture<IFullDataSource> dataSourceLoadFuture = potentialLoadFuture;
final CompletableFuture<IFullDataSource> dataSourceLoadFuture = potentialLoadFuture;
if (!this.doesFileExist)
{
// create a new Meta file and data source
@@ -235,6 +236,10 @@ public class FullDataMetaFile extends AbstractMetaDataContainerFile implements I
}
catch (Exception ex)
{
// TODO temporary fix
dataSourceLoadFuture.completeExceptionally(ex);
this.dataSourceLoadFutureRef.set(null);
// can happen if there is a missing file or the file was incorrectly formatted, or terminated early
throw new CompletionException(ex);
}