# HG changeset patch # User jiangli # Date 1537286133 14400 # Node ID 05b05af6c160cdf5bc4c57d6ce4ea32372b6e9b8 # Parent fbec908e2783a3e3e64e9cf79c777279c8528d5c 8210237: [TESTBUG]gc/stress/TestStressIHOPMultiThread.java fails with 'Unexpected exit from test [exit code: 1]' in CDS mode Summary: Fix TestStressIHOPMultiThread to handle possible OutOfMemoryError. Reviewed-by: ccheung, gziemski diff -r fbec908e2783 -r 05b05af6c160 test/hotspot/jtreg/gc/stress/TestStressIHOPMultiThread.java --- a/test/hotspot/jtreg/gc/stress/TestStressIHOPMultiThread.java Tue Sep 18 08:27:01 2018 -0400 +++ b/test/hotspot/jtreg/gc/stress/TestStressIHOPMultiThread.java Tue Sep 18 11:55:33 2018 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -181,7 +181,13 @@ public void run() { System.out.println("Start the thread " + threadId); while (TestStressIHOPMultiThread.this.isRunning()) { - allocate(amountOfGarbage); + try { + allocate(amountOfGarbage); + } catch (OutOfMemoryError e) { + free(); + System.out.println("OutOfMemoryError occurred in thread " + threadId); + break; + } free(); } }