Disallow ReadContext inside DriverFactory

prdoyle · Nov 17, 2023 · a2003d8 · a2003d8
1 parent 1e42dba
commit a2003d8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/bosk-core/src/main/java/io/vena/bosk/Bosk.java b/bosk-core/src/main/java/io/vena/bosk/Bosk.java
@@ -650,7 +650,11 @@ public final class ReadContext implements AutoCloseable {
 		private ReadContext() {
 			originalRoot = rootSnapshot.get();
 			if (originalRoot == null) {
-				snapshot = currentRoot;
+				try {
+					snapshot = requireNonNull(currentRoot);
+				} catch (NullPointerException e) {
+					throw new IllegalStateException("Bosk constructor has not yet finished; cannot create a ReadContext", e);
+				}
 				rootSnapshot.set(snapshot);
 				LOGGER.trace("New {}", this);
 			} else {

diff --git a/bosk-core/src/test/java/io/vena/bosk/BoskConstructorTest.java b/bosk-core/src/test/java/io/vena/bosk/BoskConstructorTest.java
@@ -128,6 +128,16 @@ void defaultRoot_matches() {
 		}
 	}
 
+	@Test
+	void readContextDuringDriverFactory_throws() {
+		assertThrows(IllegalStateException.class, ()->{
+			new Bosk<>("readContext", SimpleTypes.class, newEntity(), (b,d) -> {
+				try (val __ = b.readContext()) {}
+				return d;
+			});
+		});
+	}
+
 	////////////////
 	//
 	//  Helpers