From 92a7350758362b7b90576a01fdf96417298e0a5c Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 09 Oct 2006 14:15:55 +0000
Subject: [PATCH] - Change the synchronization code so that the changelog server can now be used directly through the ChangelogBroker class as a client API.

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index 1c0cd69..90065bb 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -35,6 +35,7 @@
 import java.util.ArrayList;
 import java.net.ServerSocket;
 import java.net.InetSocketAddress;
+import java.net.SocketException;
 
 import org.opends.server.backends.MemoryBackend;
 import org.opends.server.config.ConfigException;
@@ -200,19 +201,13 @@
     ServerSocket serverJmxSocket   = null;
     ServerSocket serverLdapsSocket = null;
 
-    serverLdapSocket = new ServerSocket();
-    serverLdapSocket.setReuseAddress(true);
-    serverLdapSocket.bind(new InetSocketAddress("127.0.0.1", 0));
+    serverLdapSocket = bindFreePort();
     serverLdapPort = serverLdapSocket.getLocalPort();
 
-    serverJmxSocket = new ServerSocket();
-    serverJmxSocket.setReuseAddress(true);
-    serverJmxSocket.bind(new InetSocketAddress("127.0.0.1", 0));
+    serverJmxSocket = bindFreePort();
     serverJmxPort = serverJmxSocket.getLocalPort();
 
-    serverLdapsSocket = new ServerSocket();
-    serverLdapsSocket.setReuseAddress(true);
-    serverLdapsSocket.bind(new InetSocketAddress("127.0.0.1", 0));
+    serverLdapsSocket = bindFreePort();
     serverLdapsPort = serverLdapsSocket.getLocalPort();
 
     BufferedReader reader = new BufferedReader(new FileReader(
@@ -264,6 +259,22 @@
   }
 
   /**
+   * Find and binds to a free server socket port on the local host.
+   * @return the bounded Server socket.
+   *
+   * @throws IOException in case of underlying exception.
+   * @throws SocketExceptionin case of underlying exception.
+   */
+  public static ServerSocket bindFreePort() throws IOException, SocketException
+  {
+    ServerSocket serverLdapSocket;
+    serverLdapSocket = new ServerSocket();
+    serverLdapSocket.setReuseAddress(true);
+    serverLdapSocket.bind(new InetSocketAddress("127.0.0.1", 0));
+    return serverLdapSocket;
+  }
+
+  /**
    * Shut down the server, if it has been started.
    * @param reason The reason for the shutdown.
    */

--
Gitblit v1.10.0