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/ID2Entry.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
index 617e913..875e543 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
@@ -225,17 +225,16 @@
* Create a new ID2Entry object.
*
* @param name The name of the entry database.
+ * @param storage The JE Storage.
* @param dataConfig The desired compression and encryption options for data
* stored in the entry database.
- * @param storage The JE Storage.
* @param entryContainer The entryContainer of the entry database.
* @throws StorageRuntimeException If an error occurs in the JE database.
*
*/
- ID2Entry(TreeName name, DataConfig dataConfig, Storage storage, EntryContainer entryContainer)
- throws StorageRuntimeException
+ ID2Entry(TreeName name, Storage storage, DataConfig dataConfig) throws StorageRuntimeException
{
- super(name, storage, entryContainer);
+ super(name, storage);
this.dataConfig = dataConfig;
}
@@ -409,8 +408,7 @@
try
{
- Entry entry = entryFromDatabase(value,
- entryContainer.getRootContainer().getCompressedSchema());
+ Entry entry = entryFromDatabase(value, dataConfig.getEntryEncodeConfig().getCompressedSchema());
entry.processVirtualAttributes();
return entry;
}
--
Gitblit v1.10.0