From: jprocter <Jim Procter>
Date: Tue, 13 Oct 2009 15:10:05 +0000 (+0000)
Subject: safer OOM handling when importing from XML
X-Git-Tag: Release_2_5~186
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=654b491c9f8cc282384ad0e9c3bb43d651e55b09;p=jalview.git

safer OOM handling when importing from XML
---

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index 8497df7..f9a2fa9 100755
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -1603,8 +1603,10 @@ public class Jalview2XML
               + ex + "\n");
     } catch (OutOfMemoryError e)
     {
-      new jalview.gui.OOMWarning("loading jalview XML file", e,
-              Desktop.instance);
+      // Don't use the OOM Window here
+      errorMessage = "Out of memory loading jalview XML file";
+      System.err.println("Out of memory whilst loading jalview XML file");
+      e.printStackTrace();
     }
 
     if (Desktop.instance != null)