From 002ee0b1490f104d47783e49953a75c98eae9edb Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 08 Sep 2009 09:17:12 +0000
Subject: [PATCH] Add a missing check in the setup code: we did not check if the user provided the same value for the administration connector port and the other ports.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index e37d647..9e4e242 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -3084,7 +3084,14 @@
}
qs.displayFieldInvalid(FieldName.ADMIN_CONNECTOR_PORT, true);
- } else
+ }
+ else if (adminConnectorPort == port)
+ {
+ errorMsgs.add(INFO_ADMIN_CONNECTOR_VALUE_SEVERAL_TIMES.get());
+ qs.displayFieldInvalid(FieldName.SERVER_PORT, true);
+ qs.displayFieldInvalid(FieldName.ADMIN_CONNECTOR_PORT, true);
+ }
+ else
{
getUserData().setAdminConnectorPort(adminConnectorPort);
qs.displayFieldInvalid(FieldName.ADMIN_CONNECTOR_PORT, false);
@@ -3128,6 +3135,12 @@
qs.displayFieldInvalid(FieldName.SECURITY_OPTIONS, true);
qs.displayFieldInvalid(FieldName.SERVER_PORT, true);
}
+ else if (adminConnectorPort == securePort)
+ {
+ errorMsgs.add(INFO_ADMIN_CONNECTOR_VALUE_SEVERAL_TIMES.get());
+ qs.displayFieldInvalid(FieldName.SECURITY_OPTIONS, true);
+ qs.displayFieldInvalid(FieldName.ADMIN_CONNECTOR_PORT, true);
+ }
else
{
getUserData().setSecurityOptions(sec);
--
Gitblit v1.10.0