# HG changeset patch
# User iveresov
# Date 1289525810 28800
# Node ID 84d114b9170e1224be6fadf51a330a3db7c56df2
# Parent  31aff7f873c677044495003cf1ca06099f49fc46# Parent  b0e6879e48fa67ab097fc9972f8eca9967cb2f76
Merge

diff -r b0e6879e48fa -r 84d114b9170e .hgtags
--- 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
diff -r b0e6879e48fa -r 84d114b9170e test/compiler/6857159/Test6857159.java
--- 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;