From 92f42b02a2ac9532f45937963f784cc772fd8511 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 27 Apr 2015 09:20:09 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
index 73ed07d..c435c2d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
@@ -2973,11 +2973,6 @@
{
entryContainer = rootContainer.getEntryContainer(rebuildConfig.getBaseDN());
suffix = new Suffix(entryContainer, null, null, null);
- if (suffix == null)
- {
- throw new InitializationException(
- ERR_JEB_REBUILD_SUFFIX_ERROR.get(rebuildConfig.getBaseDN()));
- }
}
/**
@@ -3625,7 +3620,7 @@
*
* @return The number of entries processed.
*/
- public long getEntriesProcess()
+ public long getEntriesProcessed()
{
return this.entriesProcessed.get();
}
@@ -3700,7 +3695,7 @@
{
return;
}
- long entriesProcessed = rebuildManager.getEntriesProcess();
+ long entriesProcessed = rebuildManager.getEntriesProcessed();
long deltaCount = entriesProcessed - previousProcessed;
float rate = 1000f * deltaCount / deltaTime;
float completed = 0;
@@ -3773,17 +3768,17 @@
@Override
public void run()
{
- long latestCount = reader.getEntriesRead() + 0;
- long deltaCount = latestCount - previousCount;
+ long entriesRead = reader.getEntriesRead();
+ long entriesIgnored = reader.getEntriesIgnored();
+ long entriesRejected = reader.getEntriesRejected();
+ long deltaCount = entriesRead - previousCount;
+
long latestTime = System.currentTimeMillis();
long deltaTime = latestTime - previousTime;
if (deltaTime == 0)
{
return;
}
- long entriesRead = reader.getEntriesRead();
- long entriesIgnored = reader.getEntriesIgnored();
- long entriesRejected = reader.getEntriesRejected();
float rate = 1000f * deltaCount / deltaTime;
logger.info(NOTE_JEB_IMPORT_PROGRESS_REPORT, entriesRead, entriesIgnored, entriesRejected, rate);
try
@@ -3846,7 +3841,7 @@
{
// Unlikely to happen and not critical.
}
- previousCount = latestCount;
+ previousCount = entriesRead;
previousTime = latestTime;
}
}
--
Gitblit v1.10.0