From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/backends/jeb/IndexRebuildThread.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/IndexRebuildThread.java b/opends/src/server/org/opends/server/backends/jeb/IndexRebuildThread.java
index 4696030..85fc389 100644
--- a/opends/src/server/org/opends/server/backends/jeb/IndexRebuildThread.java
+++ b/opends/src/server/org/opends/server/backends/jeb/IndexRebuildThread.java
@@ -389,8 +389,9 @@
try
{
EntryID entryID = new EntryID(key);
- Entry entry = JebFormat.entryFromDatabase(data.getData(),
- ec.getRootContainer().getCompressedSchema());
+ Entry entry = ID2Entry.entryFromDatabase(
+ ByteString.wrap(data.getData()),
+ ec.getRootContainer().getCompressedSchema());
// Insert into dn2id.
if (dn2id.insert(txn, entry.getDN(), entryID))
@@ -472,8 +473,9 @@
try
{
EntryID entryID = new EntryID(key);
- Entry entry = JebFormat.entryFromDatabase(data.getData(),
- ec.getRootContainer().getCompressedSchema());
+ Entry entry = ID2Entry.entryFromDatabase(
+ ByteString.wrap(data.getData()),
+ ec.getRootContainer().getCompressedSchema());
// Insert into dn2uri.
if (dn2uri.addEntry(txn, entry))
@@ -558,8 +560,9 @@
try
{
EntryID entryID = new EntryID(key);
- Entry entry = JebFormat.entryFromDatabase(data.getData(),
- ec.getRootContainer().getCompressedSchema());
+ Entry entry = ID2Entry.entryFromDatabase(
+ ByteString.wrap(data.getData()),
+ ec.getRootContainer().getCompressedSchema());
// Check that the parent entry exists.
DN parentDN = ec.getParentWithinBase(entry.getDN());
@@ -671,8 +674,9 @@
try
{
EntryID entryID = new EntryID(key);
- Entry entry = JebFormat.entryFromDatabase(data.getData(),
- ec.getRootContainer().getCompressedSchema());
+ Entry entry = ID2Entry.entryFromDatabase(
+ ByteString.wrap(data.getData()),
+ ec.getRootContainer().getCompressedSchema());
// Check that the parent entry exists.
DN parentDN = ec.getParentWithinBase(entry.getDN());
@@ -809,8 +813,9 @@
try
{
EntryID entryID = new EntryID(key);
- Entry entry = JebFormat.entryFromDatabase(data.getData(),
- ec.getRootContainer().getCompressedSchema());
+ Entry entry = ID2Entry.entryFromDatabase(
+ ByteString.wrap(data.getData()),
+ ec.getRootContainer().getCompressedSchema());
// Insert into attribute indexType.
if(index.addEntry(txn, entryID, entry))
@@ -887,8 +892,9 @@
try
{
EntryID entryID = new EntryID(key);
- Entry entry = JebFormat.entryFromDatabase(data.getData(),
- ec.getRootContainer().getCompressedSchema());
+ Entry entry = ID2Entry.entryFromDatabase(
+ ByteString.wrap(data.getData()),
+ ec.getRootContainer().getCompressedSchema());
// Insert into attribute indexType.
if(vlvIndex.addEntry(txn, entryID, entry))
@@ -973,8 +979,9 @@
try
{
EntryID entryID = new EntryID(key);
- Entry entry = JebFormat.entryFromDatabase(data.getData(),
- ec.getRootContainer().getCompressedSchema());
+ Entry entry = ID2Entry.entryFromDatabase(
+ ByteString.wrap(data.getData()),
+ ec.getRootContainer().getCompressedSchema());
// Insert into attribute indexType.
if(index.addEntry(txn, entryID, entry))
--
Gitblit v1.10.0