diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java index 7f2145f00..95a5f7a3d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java @@ -163,7 +163,7 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi final List scheduledJobDetails = this.schedularWritePlatformService .retrieveAllJobs(fineractProperties.getNodeId()); for (final ScheduledJobDetail jobDetail : scheduledJobDetails) { - if (jobDetail.isTriggerMisfired() || jobDetail.isMismatchedJob()) { + if (jobDetail.isTriggerMisfired()) { if (jobDetail.isActiveSchedular()) { executeJob(jobDetail, SchedulerServiceConstants.TRIGGER_TYPE_CRON, Collections.emptySet()); jobDetail.setMismatchedJob(false); @@ -216,8 +216,6 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi if (nodeIdStored.equals(fineractProperties.getNodeId()) || nodeIdStored.equals("0")) { executeJob(scheduledJobDetail, null, jobParameterDTOSet); - scheduledJobDetail.setMismatchedJob(false); - this.schedularWritePlatformService.saveOrUpdate(scheduledJobDetail); } else { scheduledJobDetail.setMismatchedJob(true); this.schedularWritePlatformService.saveOrUpdate(scheduledJobDetail); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedularWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedularWritePlatformServiceJpaRepositoryImpl.java index f2645cd7c..d8a1f9e6d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedularWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedularWritePlatformServiceJpaRepositoryImpl.java @@ -148,6 +148,7 @@ public class SchedularWritePlatformServiceJpaRepositoryImpl implements Schedular isStopExecution = true; } else if (!isStopExecution) { scheduledJobDetail.setCurrentlyRunning(true); + scheduledJobDetail.setMismatchedJob(false); } this.scheduledJobDetailsRepository.save(scheduledJobDetail); return isStopExecution;