From 8fb27822a0621950de7c1392fbda0f52e5c6be59 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 05 Sep 2007 17:01:23 +0000
Subject: [PATCH] Have more specific error messages and fix a bug in initialization in non-prompt mode.
---
opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java b/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java
index a2d1ce0..6133171 100644
--- a/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java
+++ b/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java
@@ -1400,7 +1400,7 @@
{
if (port1Arg.getValue() == port2Arg.getValue())
{
- Message message = ERR_REPLICATION_SAME_SERVER_PORT.get(
+ Message message = ERR_REPLICATION_ENABLE_SAME_SERVER_PORT.get(
hostName1Arg.getValue(), port1Arg.getValue());
addMessage(buf, message);
}
@@ -1453,23 +1453,12 @@
{
// The startTLS and useSSL arguments are already validated in
// SecureConnectionCliParser.validateGlobalOptions.
- if (hostName1Arg.getValue().equalsIgnoreCase(hostName2Arg.getValue()) &&
- !isInteractive())
- {
- if (port1Arg.getValue() == port2Arg.getValue())
- {
- Message message = ERR_REPLICATION_SAME_SERVER_PORT.get(
- hostName1Arg.getValue(), port1Arg.getValue());
- addMessage(buf, message);
- }
- }
-
if (hostNameSourceArg.getValue().equalsIgnoreCase(
hostNameDestinationArg.getValue()) && !isInteractive())
{
- if (portSourceArg.getValue() == portSourceArg.getValue())
+ if (portSourceArg.getValue() == portDestinationArg.getValue())
{
- Message message = ERR_REPLICATION_SAME_SERVER_PORT.get(
+ Message message = ERR_REPLICATION_INITIALIZE_SAME_SERVER_PORT.get(
hostNameSourceArg.getValue(), portSourceArg.getValue());
addMessage(buf, message);
}
--
Gitblit v1.10.0