Merge branch 'JAL-1601-direct-jpred4-rest-service' into development/Release_2_12_Branch

[jalview.git] / src / jalview / ws2 / actions / BaseTask.java

diff --git a/src/jalview/ws2/actions/BaseTask.java b/src/jalview/ws2/actions/BaseTask.java
index 387ca69..ebffdc9 100644 (file)
--- a/src/jalview/ws2/actions/BaseTask.java
+++ b/src/jalview/ws2/actions/BaseTask.java
@@ -63,7 +63,7 @@ public abstract class BaseTask<T extends BaseJob, R> implements TaskI<R>
   }
 
   @Override
-  public final List<? extends BaseJob> getSubJobs()
+  public final List<T> getSubJobs()
   {
     return jobs;
   }
@@ -207,6 +207,7 @@ public abstract class BaseTask<T extends BaseJob, R> implements TaskI<R>
     catch (Exception e)
     {
       eventHandler.fireTaskException(e);
+      setStatus(JobStatus.SERVER_ERROR);
       throw e;
     }
   }