Unverified Commit ee601c0d authored by Fabien Viale's avatar Fabien Viale Committed by GitHub
Browse files

Merge pull request #3974 from oanaBiancaSchiopu/fix-detailed-variable-of-job

Remove-set-detailed-variables-since-it-is-already-set-on-job-info
parents a43e34b4 7c2a5305
......@@ -103,7 +103,9 @@ public class ClientJobState extends JobState {
this.setOnTaskError(jobState.getOnTaskErrorProperty().getValue());
this.genericInformation = new LinkedHashMap<>(jobState.getGenericInformation());
jobInfo.setDetailedVariables(new LinkedHashMap<>(this.variables));
if (jobInfo.getDetailedVariables() == null) {
jobInfo.setDetailedVariables(new LinkedHashMap<>(variables));
}
jobInfo.setGenericInformation(this.genericInformation);
jobInfo.setVariables(this.getVariablesAsReplacementMap());
......
......@@ -109,7 +109,7 @@ public class TaskKillerTest {
is(false));
// Wait 10 seconds for killing timeout to be exceeded
waitOrFailTest(10000);
waitOrFailTest(12000);
assertThat("Task Killer must have interrupted at least twice after timeout has passed",
testThreadToBeInterrupted.isInterruptedMoreThanOnce,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment