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/EntryCachePreloader.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java b/opends/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
index 9ef11f0..3cb5363 100644
--- a/opends/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
+++ b/opends/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
@@ -51,6 +51,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.Entry;
+import org.opends.server.types.ByteString;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.loggers.ErrorLogger.logError;
@@ -291,7 +292,7 @@
long entryID =
JebFormat.entryIDFromDatabase(preloadEntry.entryIDBytes);
Entry entry =
- JebFormat.entryFromDatabase(preloadEntry.entryBytes,
+ ID2Entry.entryFromDatabase(ByteString.wrap(preloadEntry.entryBytes),
jeb.getRootContainer().getCompressedSchema());
try {
// Even if the entry does not end up in the cache its still
--
Gitblit v1.10.0