test/jdk/javax/naming/module/src/test/test/StorePerson.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 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) 2015, 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.
*** 29,52 ****
   * must be specified to the JNDI initial context.
   */
  
  package test;
  
  import java.net.*;
  import java.util.*;
  import javax.naming.*;
  import javax.naming.directory.*;
  
  import org.example.person.Person;
  
  public class StorePerson {
  
      // LDAP capture file
      private static final String LDAP_CAPTURE_FILE =
          System.getProperty("test.src") + "/src/test/test/StorePerson.ldap";
-     // LDAPServer socket
-     private static ServerSocket serverSocket;
  
      public static void main(String[] args) throws Exception {
  
          /*
           * Process arguments
--- 29,59 ----
   * must be specified to the JNDI initial context.
   */
  
  package test;
  
+ import java.io.PrintStream;
  import java.net.*;
  import java.util.*;
  import javax.naming.*;
  import javax.naming.directory.*;
  
  import org.example.person.Person;
  
  public class StorePerson {
  
+     static {
+         final PrintStream out = new PrintStream(System.out, true);
+         final PrintStream err = new PrintStream(System.err, true);
+ 
+         System.setOut(out);
+         System.setErr(err);
+     }
+ 
      // LDAP capture file
      private static final String LDAP_CAPTURE_FILE =
          System.getProperty("test.src") + "/src/test/test/StorePerson.ldap";
  
      public static void main(String[] args) throws Exception {
  
          /*
           * Process arguments
*** 65,75 ****
  
          /*
           * Launch the LDAP server with the StorePerson.ldap capture file
           */
  
!         serverSocket = new ServerSocket(0);
          new Thread(new Runnable() {
              @Override
              public void run() {
                  try {
                      new LDAPServer(serverSocket, LDAP_CAPTURE_FILE);
--- 72,83 ----
  
          /*
           * Launch the LDAP server with the StorePerson.ldap capture file
           */
  
!         try (ServerSocket serverSocket = new ServerSocket()) {
!             serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
              new Thread(new Runnable() {
                  @Override
                  public void run() {
                      try {
                          new LDAPServer(serverSocket, LDAP_CAPTURE_FILE);
*** 173,183 ****
              cleanup(ctx, dn, dn2);
              return;
          }
  
          cleanup(ctx, dn, dn2);
!         return;
      }
  
      /*
       * Remove objects from the LDAP directory
       */
--- 181,191 ----
                  cleanup(ctx, dn, dn2);
                  return;
              }
  
              cleanup(ctx, dn, dn2);
!         }
      }
  
      /*
       * Remove objects from the LDAP directory
       */