Merge
authorjwilhelm
Thu, 22 Jan 2015 12:26:25 +0100
changeset 28674 9c49f00a2b58
parent 28673 4dbf48487f1f (diff)
parent 28672 9a2e5d103695 (current diff)
child 28676 3235e4827e1a
Merge
--- a/jdk/test/java/lang/ref/OOMEInReferenceHandler.java	Sun Jan 18 11:50:10 2015 -0800
+++ b/jdk/test/java/lang/ref/OOMEInReferenceHandler.java	Thu Jan 22 12:26:25 2015 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -25,7 +25,7 @@
  * @test
  * @bug 7038914 8016341
  * @summary Verify that the reference handler does not die after an OOME allocating the InterruptedException object
- * @run main/othervm -Xmx24M -XX:-UseTLAB OOMEInReferenceHandler
+ * @run main/othervm -XX:-UseGCOverheadLimit -Xmx24M -XX:-UseTLAB OOMEInReferenceHandler
  * @author peter.levart@gmail.com
  */