From 7197d0b8c339e298e7a6aed6df9ae45a3dbf110e Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 16 Dec 2019 15:35:26 +0100
Subject: [PATCH] Revert changes in Schedule.java
---
.../java/caosdb/server/jobs/Schedule.java | 21 +++++--------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/src/main/java/caosdb/server/jobs/Schedule.java b/src/main/java/caosdb/server/jobs/Schedule.java
index 92e0e3fb..4e7f005f 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);
}
}
}
--
GitLab