zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-04-30 03:57:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix semantic merge conflict accidentally introduced (#1301)

Browse source
This commit is contained in:
gbrodman 2021-08-26 14:15:56 -06:00 • committed by GitHub
parent 6349bad49b
commit 00d2767e88
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/test/java/google/registry/model/replay/ReplicateToDatastoreActionTest.java
View file

@ -188,7 +188,7 @@ public class ReplicateToDatastoreActionTest {
@Test @Test
void testMissingTransactions_fullTask() { void testMissingTransactions_fullTask() {
// Write a transaction (should have a transaction id of 1). // Write a transaction (should have a transaction id of 1).
TestEntity foo = new TestEntity("foo"); TestObject foo = TestObject.create("foo");
jpaTm().transact(() -> jpaTm().insert(foo)); jpaTm().transact(() -> jpaTm().insert(foo));
// Force the last transaction id back to -1 so that we look for transaction 0. // Force the last transaction id back to -1 so that we look for transaction 0.