From 9e15b452fd52cdf656e55d9b059744e5b18635a5 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 03 Mar 2015 20:47:45 +0000
Subject: [PATCH] Minor code simplification.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java | 9 ++-------
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java | 14 +++-----------
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java
index 2d4a796..2291103 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java
@@ -197,7 +197,7 @@
long count = count(txn);
if (logger.isTraceEnabled())
{
- logger.trace(messageToLog(true, treeName, null, null, null));
+ logger.trace(messageToLog(true, treeName, txn, null, null));
}
return count;
}
@@ -260,16 +260,8 @@
builder.append(")");
builder.append(" db=");
builder.append(treeName);
- if (txn != null)
- {
- builder.append(" txn=");
- builder.append(txn);
- }
- else
- {
- builder.append(" txnid=none");
- }
-
+ builder.append(" txn=");
+ builder.append(txn);
builder.append(ServerConstants.EOL);
if (key != null)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
index 4816039..1a11e25 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
@@ -461,11 +461,6 @@
return pos >= 0;
}
- private void put(WriteableStorage txn, SortValuesSet set) throws DirectoryException
- {
- put(txn, set.getKeyBytes(), set.toByteString());
- }
-
/**
* Gets the types of the attribute values to sort.
*
@@ -588,8 +583,8 @@
if(newSize >= sortedSetCapacity)
{
SortValuesSet splitSortValuesSet = sortValuesSet.split(newSize / 2);
- put(txn, splitSortValuesSet); // splitAfter
- put(txn, sortValuesSet); // after
+ put(txn, splitSortValuesSet.getKeyBytes(), splitSortValuesSet.toByteString()); // splitAfter
+ put(txn, sortValuesSet.getKeyBytes(), sortValuesSet.toByteString()); // after
if(logger.isTraceEnabled())
{
--
Gitblit v1.10.0