From 115db06bdb621c5e10d77b305b059de1b807bd0c Mon Sep 17 00:00:00 2001
From: mlarsson <unknown>
Date: Tue, 14 Oct 2014 19:55:54 +0200
Subject: [PATCH] 8060116: After JDK-8047976
 gc/g1/TestSummarizeRSetStatsThreads fails Summary: Also reviewed by:
 sangheon.kim@oracle.com Reviewed-by: brutisso

---
 test/gc/g1/TestSummarizeRSetStatsThreads.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/gc/g1/TestSummarizeRSetStatsThreads.java b/test/gc/g1/TestSummarizeRSetStatsThreads.java
index 99014e0cd..272304249 100644
--- a/test/gc/g1/TestSummarizeRSetStatsThreads.java
+++ b/test/gc/g1/TestSummarizeRSetStatsThreads.java
@@ -53,8 +53,8 @@ public class TestSummarizeRSetStatsThreads {
 
     // a zero in refinement thread numbers indicates that the value in ParallelGCThreads should be used.
     // Additionally use at least one thread.
-    int expectedNumRefinementThreads = refinementThreads == 0 ? workerThreads : refinementThreads;
-    expectedNumRefinementThreads = Math.max(1, expectedNumRefinementThreads);
+    int expectedNumRefinementThreads = refinementThreads;
+
     // create the pattern made up of n copies of a floating point number pattern
     String numberPattern = String.format("%0" + expectedNumRefinementThreads + "d", 0)
       .replace("0", "\\s+\\d+\\.\\d+");
@@ -73,9 +73,9 @@ public class TestSummarizeRSetStatsThreads {
       return;
     }
     // different valid combinations of number of refinement and gc worker threads
-    runTest(0, 0);
-    runTest(0, 5);
-    runTest(5, 0);
+    runTest(1, 1);
+    runTest(1, 5);
+    runTest(5, 1);
     runTest(10, 10);
     runTest(1, 2);
     runTest(4, 3);
-- 
GitLab