From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 14 Sep 2005 11:20:57 +0000 (+0000)
Subject: System.gc after outofmemory
X-Git-Tag: Release_2_05b~35
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=98eb909d0a4fe04ff6ad93f71086f1127fe4a530;p=jalview.git

System.gc after outofmemory
---

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 1efb272..24d50d4 100755
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -281,6 +281,7 @@ public class AlignViewport
       }catch(OutOfMemoryError error)
       {
         System.out.println("Out of memory calculating conservation.");
+        System.gc();
       }
     }
 
@@ -358,6 +359,7 @@ public class AlignViewport
       }catch(OutOfMemoryError error)
       {
         System.out.println("Out of memory calculating consensus.");
+        System.gc();
       }
 
     }
diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 50c89f5..1358257 100755
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -1012,6 +1012,7 @@ public class AlignmentPanel extends GAlignmentPanel
           System.out.println("########################\n"
                              +"OUT OF MEMORY "+pngFile+"\n"
                              +"########################");
+          System.gc();
         }
         catch (Exception ex)
         {
diff --git a/src/jalview/gui/PCAPanel.java b/src/jalview/gui/PCAPanel.java
index d1005c2..7e893eb 100755
--- a/src/jalview/gui/PCAPanel.java
+++ b/src/jalview/gui/PCAPanel.java
@@ -140,6 +140,7 @@ public class PCAPanel extends GPCAPanel implements Runnable
                                               , "Out of memory",
                                               JOptionPane.WARNING_MESSAGE);
         System.out.println("PCAPanel: "+er);
+        System.gc();
 
       }
 
diff --git a/src/jalview/ws/JPredClient.java b/src/jalview/ws/JPredClient.java
index 80a66c3..45d4bd1 100755
--- a/src/jalview/ws/JPredClient.java
+++ b/src/jalview/ws/JPredClient.java
@@ -259,6 +259,7 @@ public class JPredClient
                                                 , "Out of memory",
                                                 JOptionPane.WARNING_MESSAGE);
           System.out.println("JPredClient: "+er);
+          System.gc();
         }
       }
       if (result!=null)
diff --git a/src/jalview/ws/MsaWSClient.java b/src/jalview/ws/MsaWSClient.java
index 0d4b2c1..0c30201 100755
--- a/src/jalview/ws/MsaWSClient.java
+++ b/src/jalview/ws/MsaWSClient.java
@@ -335,6 +335,7 @@ public class MsaWSClient
              +"\nSee help files for increasing Java Virtual Machine memory."
              ,"Out of memory", JOptionPane.WARNING_MESSAGE );
           System.out.println("MsaWSClient: "+er);
+          System.gc();
         }
       }