From edaee7edd2de3c541dec4a1e45f7f80e40280d65 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 7 Oct 2023 16:11:06 -0500 Subject: [PATCH] Add missing Full Data error logging --- .../fullData/sources/interfaces/IIncompleteFullDataSource.java | 2 +- .../core/file/fullDatafile/FullDataMetaFile.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java index 0b794d08f..50f16bd4b 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java @@ -37,7 +37,7 @@ public interface IIncompleteFullDataSource extends IFullDataSource DhSectionPos inputPos = inputSource.getSectionPos(); DhSectionPos thisPos = this.getSectionPos(); LodUtil.assertTrue(inputPos.getDetailLevel() < thisPos.getDetailLevel()); - LodUtil.assertTrue(inputPos.overlapsExactly(this.getSectionPos())); + LodUtil.assertTrue(inputPos.overlapsExactly(this.getSectionPos()), "input source at pos: "+inputPos+" doesn't overlap with this source's pos: "+thisPos); if (inputSource.isEmpty()) { diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataMetaFile.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataMetaFile.java index 2a82e2aae..f3e1bfc59 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataMetaFile.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataMetaFile.java @@ -267,7 +267,8 @@ public class FullDataMetaFile extends AbstractMetaDataContainerFile implements I } catch (Exception ex) { - /// TODO temporary fix + LOGGER.error("Full Data Load error: "+ ex.getMessage(), ex); + dataSourceLoadFuture.completeExceptionally(ex); this.dataSourceLoadFutureRef.set(null);