commit cecc2d91236cc0394c60eb09fd114342faa44f15
author Mathieu Chartier <mathieuc@google.com> Mon Oct 13 11:45:52 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Oct 13 11:47:08 2014 -0700
tree 0e420f1e9c06ae460b44c24eb44e436a3058a95d
parent 472b1591300912af2430e3299c3b6119624c2849

Make gc-thrash able to handle OOME

Bug: 17962200
Change-Id: I0dab063af7583bd4f34bbf101858be4c9c0955fa

test/074-gc-thrash/src/Main.java

diff --git a/test/074-gc-thrash/src/Main.java b/test/074-gc-thrash/src/Main.java
index 78413f3..6ee7dce 100644
--- a/test/074-gc-thrash/src/Main.java
+++ b/test/074-gc-thrash/src/Main.java
@@ -183,7 +183,11 @@
     }
 
     private String makeString(int val) {
-        return new String("Robin" + val);
+        try {
+            return new String("Robin" + val);
+        } catch (OutOfMemoryError e) {
+            return null;
+        }
     }
 }
 
@@ -302,7 +306,11 @@
     }
 
     private String makeString(int val) {
-        return new String("Deep" + val);
+        try {
+            return new String("Deep" + val);
+        } catch (OutOfMemoryError e) {
+            return null;
+        }
     }
 }
 
@@ -319,13 +327,16 @@
         Main.startupDelay();
 
         while (!Main.quit) {
-            chunk = new byte[100000];
-            pretendToUse(chunk);
+            try {
+                chunk = new byte[100000];
+                pretendToUse(chunk);
 
-            count++;
-            if ((count % 500) == 0) {
-                Main.sleep(400);
-                sleepCount++;
+                count++;
+                if ((count % 500) == 0) {
+                    Main.sleep(400);
+                    sleepCount++;
+                }
+            } catch (OutOfMemoryError e) {
             }
         }