changeset 1925:84d114b9170e

Merge
author iveresov
date Thu, 11 Nov 2010 17:36:50 -0800
parents 31aff7f873c6 (diff) b0e6879e48fa (current diff)
children a1e319b5b13a
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Nov 09 17:31:18 2010 -0800
+++ b/.hgtags	Thu Nov 11 17:36:50 2010 -0800
@@ -128,3 +128,4 @@
 bdbc48857210a509b3c50a3291ecb9dd6a72e016 jdk7-b115
 96b3f2a7add0b445b8aa421f6823cff5a2e2fe03 jdk7-b116
 52f19c724d9634af79044a2e0defbe4a5f1adbda hs20-b02
+806d0c037e6bbb88dac0699673f4ba55ee8c02da jdk7-b117
--- a/test/compiler/6857159/Test6857159.java	Tue Nov 09 17:31:18 2010 -0800
+++ b/test/compiler/6857159/Test6857159.java	Thu Nov 11 17:36:50 2010 -0800
@@ -54,7 +54,7 @@
     }
 
     public static void main(String[] args) throws Exception {
-        for (int i = 0; i < 100000; i++) {
+        for (int i = 0; i < 20000; i++) {
             Thread t = null;
             switch (i % 3) {
               case 0: t = new ct0(); break;