From 38f03eff072d27155fe27af57b5e86a7935ab5a4 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 24 Oct 2007 14:04:30 +0000
Subject: [PATCH] Complete fix for issue 2510 (Initialize progress should display that 100 % entries are processed). The following changes apply to the initialize topology command.
---
opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java b/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
index eb41f42..cf63e80 100644
--- a/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
+++ b/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
@@ -5476,8 +5476,7 @@
}
if (displayProgress)
{
- if (!msg.equals(lastDisplayedMsg) &&
- ((currentTime - minRefreshPeriod) > lastTimeMsgDisplayed) &&
+ if (((currentTime - minRefreshPeriod) > lastTimeMsgDisplayed) &&
!msg.equals(lastDisplayedMsg))
{
printProgressMessage(msg);
@@ -5504,6 +5503,12 @@
{
isOver = true;
Message errorMsg;
+ if (displayProgress && (msg != null) && !msg.equals(lastDisplayedMsg))
+ {
+ printProgressMessage(msg);
+ lastDisplayedMsg = msg;
+ printProgressLineBreak();
+ }
if (lastLogMsg == null)
{
errorMsg = INFO_ERROR_DURING_INITIALIZATION_NO_LOG.get(
@@ -5543,11 +5548,14 @@
throw ae;
}
}
- else if (displayProgress)
- {
+ else
+ {
+ if (displayProgress)
+ {
+ printProgressMessage(INFO_SUFFIX_INITIALIZED_SUCCESSFULLY.get());
+ printProgressLineBreak();
+ }
LOG.log(Level.INFO, "Initialization completed successfully.");
- printProgressMessage(INFO_SUFFIX_INITIALIZED_SUCCESSFULLY.get());
- printProgressLineBreak();
}
}
}
--
Gitblit v1.10.0