X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fslivkaws%2FSlivkaWSInstance.java;h=a5c809faff8041b3c6a1aa9b6eec2abd8ee567d6;hb=736815bebc732aa97efaad70a7c2b3b4f4e77941;hp=a75046d34498ce68a626ac0f98ed66b62617fca2;hpb=959709cf53e1cb865a772b25b0ef62963a73a57b;p=jalview.git diff --git a/src/jalview/ws/slivkaws/SlivkaWSInstance.java b/src/jalview/ws/slivkaws/SlivkaWSInstance.java index a75046d..a5c809f 100644 --- a/src/jalview/ws/slivkaws/SlivkaWSInstance.java +++ b/src/jalview/ws/slivkaws/SlivkaWSInstance.java @@ -15,6 +15,7 @@ import java.io.InputStreamReader; import java.util.Arrays; import java.util.EnumMap; import java.util.HashSet; +import java.util.List; import java.util.Optional; import java.util.Set; @@ -71,24 +72,28 @@ public abstract class SlivkaWSInstance extends ServiceWithParameters @Override public final boolean updateJobProgress(WsJob job) throws IOException { - Optional logFile = client.getJobResults(job.getJobId()).stream() - .filter(f -> f.getLabel() == "log").findFirst(); + List files = client.getJobResults(job.getJobId()); + Optional logFile = files.stream() + .filter(f -> f.getLabel().equals("log")).findFirst(); + boolean newContent = false; if (logFile.isPresent()) { InputStream stream = logFile.get().getContent(); long nextChunk = stream.skip(job.getNextChunk()); - job.setnextChunk(nextChunk + appendJobStatus(job, stream)); + int len = appendJobStatus(job, stream); + job.setnextChunk(nextChunk + len); + newContent |= len > 0; } if (failedStates.contains(job.getJobState())) { - Optional errLogFile = client.getJobResults(job.getJobId()).stream() - .filter(f -> f.getLabel() == "error-log").findFirst(); + Optional errLogFile = files.stream() + .filter(f -> f.getLabel().equals("error-log")).findFirst(); if (errLogFile.isPresent()) { - appendJobStatus(job, errLogFile.get().getContent()); + newContent |= appendJobStatus(job, errLogFile.get().getContent()) > 0; } } - return false; + return newContent; } private int appendJobStatus(WsJob job, InputStream stream) throws IOException