git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6bfff06
)
catch OOM earlier * JAL-595
author
jprocter
<Jim Procter>
Tue, 29 Jun 2010 09:42:46 +0000
(09:42 +0000)
committer
jprocter
<Jim Procter>
Tue, 29 Jun 2010 09:42:46 +0000
(09:42 +0000)
src/jalview/gui/SequenceFetcher.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/SequenceFetcher.java
b/src/jalview/gui/SequenceFetcher.java
index
34f0e79
..
7b42a3d
100755
(executable)
--- a/
src/jalview/gui/SequenceFetcher.java
+++ b/
src/jalview/gui/SequenceFetcher.java
@@
-416,7
+416,18
@@
public class SequenceFetcher extends JPanel implements Runnable
}
}
}
}
- AlignmentI indres = proxy.getSequenceRecords(item);
+
+ AlignmentI indres = null;
+ try
+ {
+ indres = proxy.getSequenceRecords(item);
+ } catch (OutOfMemoryError oome)
+ {
+ new OOMWarning(
+ "fetching " + item + " from "
+ + database.getSelectedItem(),oome,
+ this);
+ }
if (indres != null)
{
if (aresult == null)
if (indres != null)
{
if (aresult == null)
@@
-446,7
+457,18
@@
public class SequenceFetcher extends JPanel implements Runnable
multiacc.append(proxy.getAccessionSeparator());
}
}
multiacc.append(proxy.getAccessionSeparator());
}
}
- aresult = proxy.getSequenceRecords(multiacc.toString());
+ try
+ {
+ aresult = proxy.getSequenceRecords(multiacc.toString());
+ } catch (OutOfMemoryError oome)
+ {
+ new OOMWarning(
+ "fetching " + multiacc + " from "
+ + database.getSelectedItem(),oome,
+ this);
+ }
+
+
}
} catch (Exception e)
}
} catch (Exception e)