From 721cd804be4bf45762c1ee54db2a79cd98d027df Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 19 Sep 2007 22:28:36 +0000
Subject: [PATCH] Fix a copy paste typo that made that there was a duplicate replication error return code. Eliminate some progress messages in resetGenerationId method.
---
opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliReturnCode.java | 4 ++--
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 11 ++---------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliReturnCode.java b/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliReturnCode.java
index 0b70f4d..b526099 100644
--- a/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliReturnCode.java
+++ b/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliReturnCode.java
@@ -158,13 +158,13 @@
/**
* Error initializing Administration Framework.
*/
- ERROR_INITIALIZING_ADMINISTRATION_FRAMEWORK(20,
+ ERROR_INITIALIZING_ADMINISTRATION_FRAMEWORK(21,
ERR_REPLICATION_NO_MESSAGE.get()),
/**
* Error seeding trustore.
*/
- ERROR_SEEDING_TRUSTORE(21, ERR_REPLICATION_NO_MESSAGE.get());
+ ERROR_SEEDING_TRUSTORE(22, ERR_REPLICATION_NO_MESSAGE.get());
private Message message;
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 16536fa..b339174 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -3978,7 +3978,7 @@
ne), ne);
}
}
- resetGenerationId(ctx, suffixDn, true, sourceServerDisplay);
+ resetGenerationId(ctx, suffixDn, sourceServerDisplay);
}
/**
@@ -4030,7 +4030,7 @@
}
private void resetGenerationId(InitialLdapContext ctx,
- String suffixDn, boolean displayProgress, String sourceServerDisplay)
+ String suffixDn, String sourceServerDisplay)
throws ApplicationException
{
boolean taskCreated = false;
@@ -4139,18 +4139,11 @@
null);
throw ae;
}
- else if (displayProgress)
- {
- notifyListeners(getFormattedProgress(
- INFO_SUFFIX_INITIALIZED_SUCCESSFULLY.get()));
- }
}
}
catch (NameNotFoundException x)
{
isOver = true;
- notifyListeners(getFormattedProgress(
- INFO_SUFFIX_INITIALIZED_SUCCESSFULLY.get()));
}
catch (NamingException ne)
{
--
Gitblit v1.10.0