TransactionTest: check activeTxCursor is closed after write tx #286

greenrobot-team · greenrobot-team · commit bc28da46cebe · 2026-01-20T14:52:18.000+01:00
diff --git a/objectbox-java/src/main/java/io/objectbox/Box.java b/objectbox-java/src/main/java/io/objectbox/Box.java
@@ -89,6 +89,13 @@ Cursor<T> getReader() {
         return cursor;
     }
 
+    /**
+     * Returns if for the calling thread this has a Cursor, if any, for the currently active transaction.
+     */
+    boolean hasActiveTxCursorForCurrentThread() {
+        return activeTxCursor.get() != null;
+    }
+
     Cursor<T> getActiveTxCursor() {
         Transaction activeTx = store.activeTx.get();
         if (activeTx != null) {
diff --git a/tests/objectbox-java-test/src/test/java/io/objectbox/TransactionTest.java b/tests/objectbox-java-test/src/test/java/io/objectbox/TransactionTest.java
@@ -30,6 +30,7 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -421,20 +422,67 @@ public void testCallInReadTx() {
         assertEquals(1, counts[1]);
     }
 
+    @Test
+    public void testRunInTx_closesActiveTxCursor() {
+        final Box<TestEntity> box = getTestEntityBox();
+        AtomicBoolean hasCursorInTx = new AtomicBoolean(false);
+        store.runInTx(() -> {
+            box.count(); // Call Box API that creates a reader/activeTxCursor
+            hasCursorInTx.set(box.hasActiveTxCursorForCurrentThread());
+        });
+        // Verify a cursor for the active tx was created
+        assertTrue(hasCursorInTx.get());
+        // Check it was released
+        assertFalse(box.hasActiveTxCursorForCurrentThread());
+
+        // Verify the same in case the runnable throws
+        try {
+            store.runInTx(() -> {
+                box.count();
+                throw new IllegalStateException("Throw in transaction");
+            });
+        } catch (IllegalStateException ignored) {}
+        assertFalse(box.hasActiveTxCursorForCurrentThread());
+    }
+
+    @Test
+    public void testCallInTx_closesActiveTxCursor() throws Exception {
+        final Box<TestEntity> box = getTestEntityBox();
+        Boolean hasCursorInTx = store.callInTx(() -> {
+            box.count(); // Call Box API that creates a reader/activeTxCursor
+            return box.hasActiveTxCursorForCurrentThread();
+        });
+        // Verify a cursor for the active tx was created
+        assertTrue(hasCursorInTx);
+        // Check it was released
+        assertFalse(box.hasActiveTxCursorForCurrentThread());
+
+        // Verify the same in case the callable throws
+        try {
+            store.callInTx(() -> {
+                box.count();
+                throw new IllegalStateException("Throw in transaction");
+            });
+        } catch (IllegalStateException ignored) {}
+        assertFalse(box.hasActiveTxCursorForCurrentThread());
+    }
+
     @Test
     public void testRunInReadTx_closesActiveTxCursor() {
         final Box<TestEntity> box = getTestEntityBox();
         store.runInReadTx(box::count); // Call Box API that creates a reader/activeTxCursor
         // Verify that box does not hang on to the read-only TX: if it would, count() would re-use the cursor/tx from
         // above and not see the put object.
         putTestEntityAndExpectCount(1);
+        assertFalse(box.hasActiveTxCursorForCurrentThread());
 
         // Verify the same in case the runnable throws
         assertThrows(IllegalStateException.class, () -> store.runInReadTx(() -> {
             box.count();
             throw new IllegalStateException("Throw in transaction");
         }));
         putTestEntityAndExpectCount(2);
+        assertFalse(box.hasActiveTxCursorForCurrentThread());
     }
 
     @Test
@@ -444,13 +492,15 @@ public void testCallInReadTx_closesActiveTxCursor() {
         // Verify that box does not hang on to the read-only TX: if it would, count() would re-use the cursor/tx from
         // above and not see the put object.
         putTestEntityAndExpectCount(1);
+        assertFalse(box.hasActiveTxCursorForCurrentThread());
 
         // Verify the same in case the callable throws
         assertThrows(IllegalStateException.class, () -> store.callInReadTx(() -> {
             box.count();
             throw new IllegalStateException("Throw in transaction");
         }));
         putTestEntityAndExpectCount(2);
+        assertFalse(box.hasActiveTxCursorForCurrentThread());
     }
 
     private void putTestEntityAndExpectCount(int expectedCount) {
