diff options
author | Mathieu Chartier <mathieuc@google.com> | 2014-10-13 11:45:52 -0700 |
---|---|---|
committer | Mathieu Chartier <mathieuc@google.com> | 2014-10-13 11:47:08 -0700 |
commit | cecc2d91236cc0394c60eb09fd114342faa44f15 (patch) | |
tree | 0e420f1e9c06ae460b44c24eb44e436a3058a95d /test/074-gc-thrash | |
parent | 472b1591300912af2430e3299c3b6119624c2849 (diff) | |
download | art-cecc2d91236cc0394c60eb09fd114342faa44f15.tar.gz art-cecc2d91236cc0394c60eb09fd114342faa44f15.tar.bz2 art-cecc2d91236cc0394c60eb09fd114342faa44f15.zip |
Make gc-thrash able to handle OOME
Bug: 17962200
Change-Id: I0dab063af7583bd4f34bbf101858be4c9c0955fa
Diffstat (limited to 'test/074-gc-thrash')
-rw-r--r-- | test/074-gc-thrash/src/Main.java | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/test/074-gc-thrash/src/Main.java b/test/074-gc-thrash/src/Main.java index 78413f3676..6ee7dce503 100644 --- a/test/074-gc-thrash/src/Main.java +++ b/test/074-gc-thrash/src/Main.java @@ -183,7 +183,11 @@ class Robin extends Thread { } 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 @@ class Deep extends Thread { } 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 @@ class Large extends Thread { Main.startupDelay(); while (!Main.quit) { - chunk = new byte[100000]; - pretendToUse(chunk); - - count++; - if ((count % 500) == 0) { - Main.sleep(400); - sleepCount++; + try { + chunk = new byte[100000]; + pretendToUse(chunk); + + count++; + if ((count % 500) == 0) { + Main.sleep(400); + sleepCount++; + } + } catch (OutOfMemoryError e) { } } |