From: Jim Procter <jprocter@dundee.ac.uk>
Date: Tue, 13 May 2014 14:12:30 +0000 (+0100)
Subject: JAL-1239 make doubly sure sub job status is set to complete/cancelled
X-Git-Tag: Jalview_2_9~188^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4272f31e9cc505f9a1496e2cd002dc9250c77928;p=jalview.git

JAL-1239 make doubly sure sub job status is set to complete/cancelled
---

diff --git a/src/jalview/ws/jws2/MsaWSThread.java b/src/jalview/ws/jws2/MsaWSThread.java
index a54d0b5..08accba 100644
--- a/src/jalview/ws/jws2/MsaWSThread.java
+++ b/src/jalview/ws/jws2/MsaWSThread.java
@@ -545,6 +545,11 @@ class MsaWSThread extends AWS2Thread implements WSClientI
           }
           wsInfo.setProgressText(jobs[job].getJobnum(), OutputHeader
                   + cancelledMessage + "\n");
+        } else {
+          // if we hadn't submitted then just mark the job as cancelled.
+          jobs[job].setSubjobComplete(true);
+          wsInfo.setStatus(jobs[job].getJobnum(), WebserviceInfo.STATE_CANCELLED_OK);
+          
         }
       }
       if (cancelled)