From b3d9d81f5526d38917d4101a24e0022d8ff7bb27 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 24 Jul 2013 08:44:06 +0000
Subject: [PATCH] Userdata.java: Extracted method getDefaultPort(int basePort).
---
opends/src/quicksetup/org/opends/quicksetup/UserData.java | 44 +++++++++++++-------------------------------
1 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/UserData.java b/opends/src/quicksetup/org/opends/quicksetup/UserData.java
index 13641c4..1ad1fc7 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/UserData.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/UserData.java
@@ -25,7 +25,6 @@
* Copyright 2008-2010 Sun Microsystems, Inc.
* Portions copyright 2011-2013 ForgeRock AS.
*/
-
package org.opends.quicksetup;
import java.net.*;
@@ -579,17 +578,7 @@
*/
static public int getDefaultPort()
{
- int defaultPort = -1;
-
- for (int i=0;i<10000 && (defaultPort == -1);i+=1000)
- {
- int port = i + 389;
- if (Utils.canUseAsPort(port))
- {
- defaultPort = port;
- }
- }
- return defaultPort;
+ return getDefaultPort(389);
}
/**
@@ -602,17 +591,7 @@
*/
static public int getDefaultAdminConnectorPort()
{
- int defaultPort = -1;
-
- for (int i=0;i<10000 && (defaultPort == -1);i+=1000)
- {
- int port = i + 4444;
- if (Utils.canUseAsPort(port))
- {
- defaultPort = port;
- }
- }
- return defaultPort;
+ return getDefaultPort(4444);
}
/**
@@ -626,24 +605,27 @@
*/
public static int getDefaultSslPort(int defaultLdapPort)
{
- int defaultPort = -1;
-
int port = defaultLdapPort - 389 + 636;
// Try first with the correlated port of the default LDAP port.
if (Utils.canUseAsPort(port))
{
- defaultPort = port;
+ return port;
}
- for (int i=0;i<10000 && (defaultPort == -1);i+=1000)
+ return getDefaultPort(636);
+ }
+
+ private static int getDefaultPort(int basePort)
+ {
+ for (int i = 0; i < 10000; i += 1000)
{
- port = i + 636;
+ int port = i + basePort;
if (Utils.canUseAsPort(port))
{
- defaultPort = port;
+ return port;
}
}
- return defaultPort;
+ return -1;
}
/**
@@ -814,7 +796,7 @@
public Map<ServerDescriptor, AuthenticationData>
getRemoteWithNoReplicationPort()
{
- HashMap<ServerDescriptor, AuthenticationData> copy =
+ Map<ServerDescriptor, AuthenticationData> copy =
new HashMap<ServerDescriptor, AuthenticationData>();
copy.putAll(remoteWithNoReplicationPort);
return copy;
--
Gitblit v1.10.0