From 71967bee6329da3f73bc4fc9c1ebccb2871265c4 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 17 May 2007 16:59:51 +0000
Subject: [PATCH] Fix a problem that could prevent the server from starting under certain network conditions.
---
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java | 12 ------------
opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java | 2 +-
2 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
index 2d27853..c41b3a0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -7163,18 +7163,6 @@
errorMessages.add(message);
}
- else if (!SetupUtils.canUseAsPort(
- listener.getHost(), listener.getPort()))
- {
- // Cannot use the specified HostPort: log a message and throw an
- // InitializationException.
- int msgID = MSGID_HOST_PORT_CANNOT_BE_USED;
- String message = getMessage(msgID, listener.toString(),
- c.getConnectionHandlerName());
- logError(ErrorLogCategory.CONNECTION_HANDLING,
- ErrorLogSeverity.SEVERE_ERROR, message, msgID);
- errorMessages.add(message);
- }
else
{
usedListeners.add(listener);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java b/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
index 1157329..9719b62 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
@@ -274,7 +274,7 @@
*/
try
{
- new Socket(hostname, port);
+ new Socket().connect(socketAddress, 1000);
canUseAsPort = false;
} catch (IOException ioe)
--
Gitblit v1.10.0