Merge
This commit is contained in:
commit
463b771e3c
@ -32,6 +32,7 @@ tier1 = \
|
|||||||
:jdk_util \
|
:jdk_util \
|
||||||
-java/util/WeakHashMap/GCDuringIteration.java \
|
-java/util/WeakHashMap/GCDuringIteration.java \
|
||||||
-java/util/concurrent/Phaser/Basic.java \
|
-java/util/concurrent/Phaser/Basic.java \
|
||||||
|
-java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java
|
||||||
sun/nio/cs/ISO8859x.java \
|
sun/nio/cs/ISO8859x.java \
|
||||||
java/nio/Buffer \
|
java/nio/Buffer \
|
||||||
com/sun/crypto/provider/Cipher \
|
com/sun/crypto/provider/Cipher \
|
||||||
@ -42,6 +43,7 @@ tier2 = \
|
|||||||
java/util/zip/TestLocalTime.java \
|
java/util/zip/TestLocalTime.java \
|
||||||
java/util/concurrent/Phaser/Basic.java \
|
java/util/concurrent/Phaser/Basic.java \
|
||||||
java/util/WeakHashMap/GCDuringIteration.java \
|
java/util/WeakHashMap/GCDuringIteration.java \
|
||||||
|
java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java \
|
||||||
:jdk_io \
|
:jdk_io \
|
||||||
:jdk_nio \
|
:jdk_nio \
|
||||||
-sun/nio/cs/ISO8859x.java \
|
-sun/nio/cs/ISO8859x.java \
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -25,7 +25,10 @@
|
|||||||
* @test
|
* @test
|
||||||
* @bug 6450200
|
* @bug 6450200
|
||||||
* @summary Test proper handling of pool state changes
|
* @summary Test proper handling of pool state changes
|
||||||
|
* @library /lib/testlibrary/
|
||||||
|
* @build jdk.testlibrary.RandomFactory
|
||||||
* @run main/othervm ConfigChanges
|
* @run main/othervm ConfigChanges
|
||||||
|
* @key randomness intermittent
|
||||||
* @author Martin Buchholz
|
* @author Martin Buchholz
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -42,11 +45,12 @@ import java.util.concurrent.RejectedExecutionException;
|
|||||||
import java.util.concurrent.ThreadFactory;
|
import java.util.concurrent.ThreadFactory;
|
||||||
import java.util.concurrent.ThreadPoolExecutor;
|
import java.util.concurrent.ThreadPoolExecutor;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
import jdk.testlibrary.RandomFactory;
|
||||||
|
|
||||||
public class ConfigChanges {
|
public class ConfigChanges {
|
||||||
static final ThreadGroup tg = new ThreadGroup("pool");
|
static final ThreadGroup tg = new ThreadGroup("pool");
|
||||||
|
|
||||||
static final Random rnd = new Random();
|
static final Random rnd = RandomFactory.getRandom();
|
||||||
|
|
||||||
static void report(ThreadPoolExecutor tpe) {
|
static void report(ThreadPoolExecutor tpe) {
|
||||||
try {
|
try {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user