git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1239 make doubly sure sub job status is set to complete/cancelled
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
MsaWSThread.java
diff --git
a/src/jalview/ws/jws2/MsaWSThread.java
b/src/jalview/ws/jws2/MsaWSThread.java
index
a54d0b5
..
08accba
100644
(file)
--- 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");
}
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)
}
}
if (cancelled)