JAL-1239 make doubly sure sub job status is set to complete/cancelled
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 13 May 2014 14:12:30 +0000 (15:12 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 13 May 2014 14:12:30 +0000 (15:12 +0100)
src/jalview/ws/jws2/MsaWSThread.java

index a54d0b5..08accba 100644 (file)
@@ -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)