From b9920b77d0acf68ff300b8777801aa2cfe370e32 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 09 Jan 2013 15:34:27 +0000
Subject: [PATCH] Fix issue in Units tests, when running only the backends.jeb package. Changes include fixes to debug messages (Index) and fixes of typos as well as small refactoring and factorization of duplicated code in EntryContainer
---
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java
index 92a1588..8d95104 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -458,9 +458,9 @@
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
TRACER.debugInfo("Index entry exceeded in index %s. " +
- "Limit: %d. ID list size: %d.\nKey:",
+ "Limit: %d. ID list size: %d.\nKey:%s",
name, indexEntryLimit, entryIDList.size(),
- builder);
+ builder.toString());
}
}
@@ -510,8 +510,9 @@
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugError("The expected key does not exist in the " +
- "index %s.\nKey:%s", name, builder.toString());
+ TRACER.debugError(
+ "The expected key does not exist in the index %s.\nKey:%s ",
+ name, builder.toString());
}
}
@@ -565,8 +566,9 @@
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugError("The expected key does not exist in the " +
- "index %s.\nKey:%s", name, builder.toString());
+ TRACER.debugError(
+ "The expected key does not exist in the index %s.\nKey:%s ",
+ name, builder.toString());
}
setTrusted(txn, false);
@@ -636,9 +638,9 @@
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
TRACER.debugInfo("Index entry exceeded in index %s. " +
- "Limit: %d. ID list size: %d.\nKey:",
+ "Limit: %d. ID list size: %d.\nKey:%s",
name, indexEntryLimit, idCountDelta + addedIDs.size(),
- builder);
+ builder.toString());
}
}
@@ -687,8 +689,9 @@
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugError("The expected key does not exist in the " +
- "index %s.\nKey:%s", name, builder.toString());
+ TRACER.debugError(
+ "The expected key does not exist in the index %s.\nKey:%s",
+ name, builder.toString());
}
setTrusted(txn, false);
@@ -792,8 +795,9 @@
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugError("The expected key does not exist in the " +
- "index %s.\nKey:%s", name, builder.toString());
+ TRACER.debugError(
+ "The expected key does not exist in the index %s.\nKey:%s",
+ name, builder.toString());
}
setTrusted(txn, false);
@@ -875,8 +879,9 @@
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugError("The expected key does not exist in the " +
- "index %s.\nKey:%s", name, builder.toString());
+ TRACER.debugError(
+ "The expected key does not exist in the index %s.\nKey:%s",
+ name, builder.toString());
}
setTrusted(txn, false);
--
Gitblit v1.10.0