From a78196b82cb4e16b6f9d54fd0b82129369e4313c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Mon, 30 Jul 2018 09:16:17 +0200
Subject: [PATCH] fix: iss1129
Inputs are not checked for null during update state of task
Inputs are only logged into debug log
---
.../haas_spim_benchmark/core/TaskComputation.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
index 63faf432..82cb41a1 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
@@ -1,5 +1,7 @@
package cz.it4i.fiji.haas_spim_benchmark.core;
+import com.google.common.collect.Streams;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -10,8 +12,8 @@ import java.util.Scanner;
import java.util.stream.Collectors;
import org.apache.commons.math3.util.Pair;
-
-import com.google.common.collect.Streams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import cz.it4i.fiji.haas_java_client.JobState;
import cz.it4i.fiji.haas_java_client.SynchronizableFileType;
@@ -19,6 +21,9 @@ import cz.it4i.fiji.haas_java_client.SynchronizableFileType;
public class TaskComputation {
+ public static final Logger log = LoggerFactory.getLogger(
+ cz.it4i.fiji.haas_spim_benchmark.core.TaskComputation.class);
+
public static class Log {
final private String name;
final private String content;
@@ -249,8 +254,10 @@ public class TaskComputation {
}
}
scanner.close();
-
- return !(inputs == null || id == null);
+ if (log.isDebugEnabled()) {
+ log.debug("Job parameters resolved id = {}, inputs = {}", id, inputs);
+ }
+ return id == null;
}
private String getSnakemakeOutput() {
--
GitLab