diff --git a/src/main/java/caosdb/server/jobs/Schedule.java b/src/main/java/caosdb/server/jobs/Schedule.java index 92e0e3fb2345fbfe2ef652a1f8f12b6abec06097..4e7f005f3d2f790008a991a0138d62013f6a545a 100644 --- a/src/main/java/caosdb/server/jobs/Schedule.java +++ b/src/main/java/caosdb/server/jobs/Schedule.java @@ -31,11 +31,9 @@ class ScheduledJob { long runtime = 0; final Job job; private long startTime = -1; - private final JobExecutionTime executionTime; public ScheduledJob(final Job j) { this.job = j; - this.executionTime = j.getExecutionTime(); } public void run() { @@ -73,17 +71,12 @@ class ScheduledJob { } public JobExecutionTime getExecutionTime() { - return this.executionTime; + return this.job.getExecutionTime(); } public boolean skip() { return this.job.getTarget().skipJob(); } - - @Override - public String toString() { - return "SCHEDULED_" + this.job.toString(); - } } public class Schedule { @@ -105,14 +98,10 @@ public class Schedule { public void runJobs(final JobExecutionTime time) { for (final ScheduledJob scheduledJob : this.jobs) { - try { - if (scheduledJob.getExecutionTime().ordinal() == time.ordinal() - || (time.ordinal() <= JobExecutionTime.POST_CHECK.ordinal() - && scheduledJob.getExecutionTime().ordinal() < time.ordinal())) { - runJob(scheduledJob); - } - } catch (RuntimeException e) { - throw new RuntimeException(scheduledJob.toString(), e); + if (scheduledJob.getExecutionTime().ordinal() == time.ordinal() + || (time.ordinal() <= JobExecutionTime.POST_CHECK.ordinal() + && scheduledJob.getExecutionTime().ordinal() < time.ordinal())) { + runJob(scheduledJob); } } }