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
Merge branch 'develop' into feature/JAL-3551Pymol
[jalview.git]
/
src
/
jalview
/
ws
/
JobStateSummary.java
diff --git
a/src/jalview/ws/JobStateSummary.java
b/src/jalview/ws/JobStateSummary.java
index
4d3db58
..
6b86775
100644
(file)
--- a/
src/jalview/ws/JobStateSummary.java
+++ b/
src/jalview/ws/JobStateSummary.java
@@
-119,7
+119,8
@@
public class JobStateSummary
{
serror++;
j.subjobComplete = true;
{
serror++;
j.subjobComplete = true;
- wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_STOPPED_SERVERERROR);
+ wsInfo.setStatus(j.jobnum,
+ WebserviceInfo.STATE_STOPPED_SERVERERROR);
}
else if (j.isBroken())
{
}
else if (j.isBroken())
{
@@
-152,7
+153,8
@@
public class JobStateSummary
}
// } catch (OutOfMemoryError e)
// {
}
// } catch (OutOfMemoryError e)
// {
- // System.err.println("Out of memory when displaying status. Squashing error.");
+ // System.err.println("Out of memory when displaying status. Squashing
+ // error.");
// wsInfo.appendProgressText(j.jobnum,
// "..\n(Out of memory when displaying status)\n");
// }
// wsInfo.appendProgressText(j.jobnum,
// "..\n(Out of memory when displaying status)\n");
// }