# HG changeset patch # User clanger # Date 1609268576 0 # Tue Dec 29 19:02:56 2020 +0000 # Node ID 7f6b674a6d630930cd1c4e43df3ba8e450bf5df6 # Parent 414c74e13d4379706b3e3c37f6ea073cca75eaf9 8257997: sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java again reports leaks after JDK-8257884 Reviewed-by: mbaesken diff -r a73a15f08bd4 -r 0a43552afd88 test/sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java --- a/test/sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java Sat Apr 24 05:30:41 2021 -0700 +++ b/test/sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java Sat Apr 24 05:32:57 2021 -0700 @@ -31,7 +31,7 @@ /* * @test - * @bug 8256818 8257670 8257884 + * @bug 8256818 8257670 8257884 8257997 * @summary Test that creating and closing SSL Sockets without bind/connect * will not leave leaking socket file descriptors * @run main/native/manual/othervm SSLSocketLeak @@ -45,7 +45,6 @@ * /FeFileUtils.dll * jtreg <...> -nativepath:. \jdk\test\sun\security\ssl\SSLSocketImpl\SSLSocketLeak.java */ -// Note: this test is not reliable, run it manually. public class SSLSocketLeak { // number of sockets to open/close @@ -54,7 +53,7 @@ private static volatile boolean nativeLibLoaded; // percentage of accepted growth of open handles - private static final int OPEN_HANDLE_GROWTH_THRESHOLD = IS_WINDOWS ? 25 : 10; + private static final int OPEN_HANDLE_GROWTH_THRESHOLD_PERCENTAGE = IS_WINDOWS ? 25 : 10; public static void main(String[] args) throws IOException { long fds_start = getProcessHandleCount(); @@ -68,7 +67,7 @@ long fds_end = getProcessHandleCount(); System.out.println("FDs in the end: " + fds_end); - if ((fds_end - fds_start) > (NUM_TEST_SOCK / OPEN_HANDLE_GROWTH_THRESHOLD)) { + if ((fds_end - fds_start) > ((NUM_TEST_SOCK * OPEN_HANDLE_GROWTH_THRESHOLD_PERCENTAGE)) / 100) { throw new RuntimeException("Too many open file descriptors. Looks leaky."); } }