From cdd5a70a92a808d063f32f1454e3584165beab53 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 29 Dec 2018 09:22:37 +0000
Subject: [PATCH] JobResult...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/JobQueue.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/JobQueue.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/JobQueue.java
index 6c33bae..8cd3ac2 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/JobQueue.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/JobQueue.java
@@ -30,7 +30,7 @@
* @param job
* @return The given job (if it's not already running or queued), otherwise the already running or queued job.
*/
- public AbstractJob append(AbstractJob<T> job) {
+ public AbstractJob append(AbstractJob job) {
synchronized (queue) {
for (AbstractJob queuedJob : queue) {
if (Objects.equals(queuedJob.getId(), job.getId())) {
@@ -83,15 +83,15 @@
}
}
- private class CallableTask implements Callable<T> {
- private AbstractJob<T> job;
+ private class CallableTask implements Callable<JobResult<T>> {
+ private AbstractJob job;
- private CallableTask(AbstractJob<T> job) {
+ private CallableTask(AbstractJob job) {
this.job = job;
}
@Override
- public T call() throws Exception {
+ public JobResult<T> call() throws Exception {
if (job.isCancelledRequested()) {
job.setStatus(AbstractJob.Status.CANCELLED);
return null;
@@ -99,7 +99,7 @@
try {
log.info("Starting job: " + job.getId());
job.setStatus(AbstractJob.Status.RUNNING);
- T result = job.execute();
+ JobResult<T> result = job.execute();
if (!job.isFinished()) {
// Don't overwrite status failed set by job.
job.setStatus(AbstractJob.Status.DONE);
--
Gitblit v1.10.0