test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 50,67 ****
  
  import static java.util.concurrent.TimeUnit.MILLISECONDS;
  import static java.util.concurrent.TimeUnit.NANOSECONDS;
  
  
! class DeadServerTimeoutSSLTest implements Callable {
  
!     Hashtable env;
      DeadSSLServer server;
      boolean passed = false;
      private int HANGING_TEST_TIMEOUT = 20_000;
  
!     public DeadServerTimeoutSSLTest(Hashtable env) throws IOException {
          this.server = new DeadSSLServer();
          this.env = env;
      }
  
      public void performOp(InitialContext ctx) throws NamingException {}
--- 50,67 ----
  
  import static java.util.concurrent.TimeUnit.MILLISECONDS;
  import static java.util.concurrent.TimeUnit.NANOSECONDS;
  
  
! class DeadServerTimeoutSSLTest implements Callable<Boolean> {
  
!     Hashtable<Object, Object> env;
      DeadSSLServer server;
      boolean passed = false;
      private int HANGING_TEST_TIMEOUT = 20_000;
  
!     public DeadServerTimeoutSSLTest(Hashtable<Object, Object> env) throws IOException {
          this.server = new DeadSSLServer();
          this.env = env;
      }
  
      public void performOp(InitialContext ctx) throws NamingException {}
*** 104,114 ****
          }
      }
  
      public Boolean call() {
          InitialContext ctx = null;
!         ScheduledFuture killer = null;
          long start = System.nanoTime();
  
          try {
              while(!server.accepting())
                  Thread.sleep(200); // allow the server to start up
--- 104,114 ----
          }
      }
  
      public Boolean call() {
          InitialContext ctx = null;
!         ScheduledFuture<?> killer = null;
          long start = System.nanoTime();
  
          try {
              while(!server.accepting())
                  Thread.sleep(200); // allow the server to start up
*** 172,183 ****
      }
  }
  
  public class DeadSSLLdapTimeoutTest {
  
!     static Hashtable createEnv() {
!         Hashtable env = new Hashtable(11);
          env.put(Context.INITIAL_CONTEXT_FACTORY,
              "com.sun.jndi.ldap.LdapCtxFactory");
          return env;
      }
  
--- 172,183 ----
      }
  }
  
  public class DeadSSLLdapTimeoutTest {
  
!     static Hashtable<Object, Object> createEnv() {
!         Hashtable<Object, Object> env = new Hashtable<>(11);
          env.put(Context.INITIAL_CONTEXT_FACTORY,
              "com.sun.jndi.ldap.LdapCtxFactory");
          return env;
      }
  
*** 192,202 ****
          // run the DeadServerTest with connect / read timeouts set
          // and ssl enabled
          // this should exit with a SocketTimeoutException as the root cause
          // it should also use the connect timeout instead of the read timeout
          System.out.println("Running connect timeout test with 10ms connect timeout, 3000ms read timeout & SSL");
!         Hashtable sslenv = createEnv();
          sslenv.put("com.sun.jndi.ldap.connect.timeout", "10");
          sslenv.put("com.sun.jndi.ldap.read.timeout", "3000");
          sslenv.put(Context.SECURITY_PROTOCOL, "ssl");
          boolean testFailed =
              (new DeadServerTimeoutSSLTest(sslenv).call()) ? false : true;
--- 192,202 ----
          // run the DeadServerTest with connect / read timeouts set
          // and ssl enabled
          // this should exit with a SocketTimeoutException as the root cause
          // it should also use the connect timeout instead of the read timeout
          System.out.println("Running connect timeout test with 10ms connect timeout, 3000ms read timeout & SSL");
!         Hashtable<Object, Object> sslenv = createEnv();
          sslenv.put("com.sun.jndi.ldap.connect.timeout", "10");
          sslenv.put("com.sun.jndi.ldap.read.timeout", "3000");
          sslenv.put(Context.SECURITY_PROTOCOL, "ssl");
          boolean testFailed =
              (new DeadServerTimeoutSSLTest(sslenv).call()) ? false : true;