From 8df85caca96d8bb79fcc2cf01cf6ef0a3f06930d Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 13 Mar 2015 23:44:25 +0000
Subject: [PATCH] Minor code cleanup: remove DatabaseContainer.entryContainer field
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
index 18fda67..eb0599a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
@@ -482,13 +482,13 @@
config.isCompactEncoding(),
rootContainer.getCompressedSchema());
- id2entry = new ID2Entry(getIndexName(ID2ENTRY_DATABASE_NAME), entryDataConfig, storage, this);
+ id2entry = new ID2Entry(getIndexName(ID2ENTRY_DATABASE_NAME), storage, entryDataConfig);
id2entry.open(txn);
dn2id = new DN2ID(getIndexName(DN2ID_DATABASE_NAME), storage, this);
dn2id.open(txn);
- state = new State(getIndexName(STATE_DATABASE_NAME), storage, this);
+ state = new State(getIndexName(STATE_DATABASE_NAME), storage);
state.open(txn);
if (config.isSubordinateIndexesEnabled())
@@ -3170,7 +3170,7 @@
private Index newIndex(WriteableStorage txn, String name, Indexer indexer)
{
final Index index = new Index(getIndexName(name),
- indexer, state, config.getIndexEntryLimit(), 0, true, storage, txn, this);
+ storage, indexer, state, config.getIndexEntryLimit(), 0, true, txn, this);
index.open(txn);
if (!index.isTrusted())
{
@@ -3191,7 +3191,7 @@
Index newIndexForAttribute(WriteableStorage txn, TreeName indexName, Indexer indexer, int indexEntryLimit)
{
final int cursorEntryLimit = 100000;
- return new Index(indexName, indexer, state, indexEntryLimit, cursorEntryLimit, false, storage, txn, this);
+ return new Index(indexName, storage, indexer, state, indexEntryLimit, cursorEntryLimit, false, txn, this);
}
--
Gitblit v1.10.0