From 41898f409cc68b72a53a1842c914c368d906ac3c Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 29 Oct 2008 07:20:53 +0000
Subject: [PATCH] Fix for issue 3537 (QuickSetup proposed SSL port is random...)

---
 opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
index c6311eb..b01b300 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
@@ -240,28 +240,28 @@
         INFO_INSTALLDS_DESCRIPTION_SAMPLE_DATA.get());
     addArgument(sampleDataArg);
 
-    int defaultPort = UserData.getDefaultPort();
-    if (defaultPort == -1)
+    int defaultLdapPort = UserData.getDefaultPort();
+    if (defaultLdapPort == -1)
     {
-      defaultPort = 389;
+      defaultLdapPort = 389;
     }
     ldapPortArg = new IntegerArgument(
         "ldapPort".toLowerCase(), OPTION_SHORT_PORT,
         "ldapPort", false, false,
-        true, INFO_PORT_PLACEHOLDER.get(), defaultPort,
+        true, INFO_PORT_PLACEHOLDER.get(), defaultLdapPort,
         "ldapPort", true, 1, true, 65535,
         INFO_INSTALLDS_DESCRIPTION_LDAPPORT.get());
     addArgument(ldapPortArg);
 
-    defaultPort = UserData.getDefaultAdminConnectorPort();
-    if (defaultPort == -1)
+    int defaultAdminPort = UserData.getDefaultAdminConnectorPort();
+    if (defaultAdminPort == -1)
     {
-      defaultPort = 4444;
+      defaultAdminPort = 4444;
     }
     adminConnectorPortArg = new IntegerArgument(
         "adminConnectorPort".toLowerCase(), null,
         "adminConnectorPort", false, false,
-        true, INFO_PORT_PLACEHOLDER.get(), defaultPort,
+        true, INFO_PORT_PLACEHOLDER.get(), defaultAdminPort,
         "adminConnectorPort", true, 1, true, 65535,
         INFO_INSTALLDS_DESCRIPTION_ADMINCONNECTORPORT.get());
     addArgument(adminConnectorPortArg);
@@ -329,7 +329,7 @@
     enableStartTLSArg.setPropertyName("enableStartTLS");
     addArgument(enableStartTLSArg);
 
-    int defaultSecurePort = UserData.getDefaultSslPort(defaultPort);
+    int defaultSecurePort = UserData.getDefaultSslPort(defaultLdapPort);
     if (defaultSecurePort == -1)
     {
       defaultSecurePort = 636;

--
Gitblit v1.10.0