Fix the random test failure of purgeInMemoryRepository #387

jberet · Oct 12, 2023 · 9de8fea · 9de8fea
1 parent a9cf188
commit 9de8fea
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/test-apps/common/src/main/java/org/jberet/testapps/common/AbstractIT.java b/test-apps/common/src/main/java/org/jberet/testapps/common/AbstractIT.java
@@ -14,6 +14,8 @@
 import java.util.Locale;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
 import jakarta.batch.operations.NoSuchJobExecutionException;
 import jakarta.batch.runtime.JobExecution;
 import jakarta.batch.runtime.JobInstance;
@@ -97,13 +99,21 @@ protected void startJob(final Job job) {
         jobExecution = (JobExecutionImpl) jobOperator.getJobExecution(jobExecutionId);
     }
 
+    private ReentrantLock termLock = new ReentrantLock();
+
     protected void awaitTermination(final JobExecutionImpl... exes) throws InterruptedException {
-        final JobExecutionImpl exe = exes.length == 0 ? jobExecution : exes[0];
-        exe.awaitTermination(getJobTimeoutSeconds(), TimeUnit.SECONDS);
-        stepExecutions = jobOperator.getStepExecutions(exe.getExecutionId());
-        if (!stepExecutions.isEmpty()) {
-            stepExecution0 = (StepExecutionImpl) stepExecutions.get(0);
+        try {
+            termLock.lock();
+            final JobExecutionImpl exe = exes.length == 0 ? jobExecution : exes[0];
+            exe.awaitTermination(getJobTimeoutSeconds(), TimeUnit.SECONDS);
+            stepExecutions = jobOperator.getStepExecutions(exe.getExecutionId());
+            if (!stepExecutions.isEmpty()) {
+                stepExecution0 = (StepExecutionImpl) stepExecutions.get(0);
+            }
+        } finally {
+            termLock.unlock();
         }
+
     }
 
     protected void startJobAndWait(final String jobXml) throws Exception {