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-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
AbstractJabaCalcWorker.java
diff --git
a/src/jalview/ws/jws2/AbstractJabaCalcWorker.java
b/src/jalview/ws/jws2/AbstractJabaCalcWorker.java
index
897aa1e
..
b33df0c
100644
(file)
--- a/
src/jalview/ws/jws2/AbstractJabaCalcWorker.java
+++ b/
src/jalview/ws/jws2/AbstractJabaCalcWorker.java
@@
-331,23
+331,23
@@
public abstract class AbstractJabaCalcWorker extends AlignCalcWorker
System.err.println("submission error with " + getServiceActionText()
+ " :");
x.printStackTrace();
System.err.println("submission error with " + getServiceActionText()
+ " :");
x.printStackTrace();
- calcMan.workerCannotRun(this);
+ calcMan.disableWorker(this);
} catch (ResultNotAvailableException x)
{
System.err.println("collection error:\nJob ID: " + rslt);
x.printStackTrace();
} catch (ResultNotAvailableException x)
{
System.err.println("collection error:\nJob ID: " + rslt);
x.printStackTrace();
- calcMan.workerCannotRun(this);
+ calcMan.disableWorker(this);
} catch (OutOfMemoryError error)
{
} catch (OutOfMemoryError error)
{
- calcMan.workerCannotRun(this);
+ calcMan.disableWorker(this);
// consensus = null;
// hconsensus = null;
ap.raiseOOMWarning(getServiceActionText(), error);
} catch (Exception x)
{
// consensus = null;
// hconsensus = null;
ap.raiseOOMWarning(getServiceActionText(), error);
} catch (Exception x)
{
- calcMan.workerCannotRun(this);
+ calcMan.disableWorker(this);
// consensus = null;
// hconsensus = null;
// consensus = null;
// hconsensus = null;