Merge pull request #4175 from Coduz/fix-jobNpeWhenCheckingStatus

🐛 [Job Engine] Fixed NPE when checking running status for Job
eclipse-kapua · Jan 17, 2025 · 88f427b · 88f427b
2 parents 9b90d26 + c22d214
commit 88f427b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.../main/java/org/eclipse/kapua/job/engine/jbatch/persistence/JPAPersistenceManagerImpl.java b/.../main/java/org/eclipse/kapua/job/engine/jbatch/persistence/JPAPersistenceManagerImpl.java
@@ -355,6 +355,8 @@ public Timestamp jobOperatorQueryJobExecutionTimestamp(long jobExecutionId, Time
             }
 
             return txManager.execute(tx -> executionInstanceDataRepository.getJobExecutionField(tx, jobExecutionId, selectField));
+        } catch (NoSuchJobExecutionException nsjee) {
+            throw nsjee;
         } catch (Exception e) {
             throw new PersistenceException(e);
         }
@@ -364,6 +366,8 @@ public Timestamp jobOperatorQueryJobExecutionTimestamp(long jobExecutionId, Time
     public String jobOperatorQueryJobExecutionBatchStatus(long jobExecutionId) {
         try {
             return txManager.execute(tx -> executionInstanceDataRepository.<BatchStatus>getJobExecutionField(tx, jobExecutionId, JpaExecutionInstanceDataFields.BATCH_STATUS)).name();
+        } catch (NoSuchJobExecutionException nsjee) {
+            throw nsjee;
         } catch (Exception e) {
             throw new PersistenceException(e);
         }
@@ -373,6 +377,8 @@ public String jobOperatorQueryJobExecutionBatchStatus(long jobExecutionId) {
     public String jobOperatorQueryJobExecutionExitStatus(long key) {
         try {
             return txManager.execute(tx -> executionInstanceDataRepository.getJobExecutionField(tx, key, JpaExecutionInstanceDataFields.EXIT_STATUS));
+        } catch (NoSuchJobExecutionException nsjee) {
+            throw nsjee;
         } catch (Exception e) {
             throw new PersistenceException(e);
         }

diff --git a/...lipse/kapua/job/engine/jbatch/persistence/jpa/JpaExecutionInstanceDataRepositoryImpl.java b/...lipse/kapua/job/engine/jbatch/persistence/jpa/JpaExecutionInstanceDataRepositoryImpl.java
@@ -17,6 +17,7 @@
 import org.eclipse.kapua.commons.jpa.JpaAwareTxContext;
 import org.eclipse.kapua.storage.TxContext;
 
+import javax.batch.operations.NoSuchJobExecutionException;
 import javax.batch.runtime.BatchStatus;
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
@@ -155,6 +156,10 @@ public <T> T getJobExecutionField(TxContext tx, long jobExecutionId, JpaExecutio
         final EntityManager em = JpaAwareTxContext.extractEntityManager(tx);
         JpaExecutionInstanceData jpaExecutionInstanceData = em.find(JpaExecutionInstanceData.class, jobExecutionId);
 
+        if (jpaExecutionInstanceData == null) {
+            throw new NoSuchJobExecutionException("No ExecutionInstanceData found for id: " + jobExecutionId);
+        }
+
         switch (field) {
             case JOB_EXEC_ID:
                 return (T) Long.valueOf(jpaExecutionInstanceData.getId());