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/ExportJob.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/ExportJob.java b/opends/src/server/org/opends/server/backends/jeb/ExportJob.java
index 68477ab..9b540be 100644
--- a/opends/src/server/org/opends/server/backends/jeb/ExportJob.java
+++ b/opends/src/server/org/opends/server/backends/jeb/ExportJob.java
@@ -34,16 +34,13 @@
import com.sleepycat.je.LockMode;
import com.sleepycat.je.OperationStatus;
-import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
-import org.opends.server.types.LDIFExportConfig;
import org.opends.server.util.LDIFException;
import org.opends.server.util.StaticUtils;
import java.io.IOException;
import java.util.*;
-import org.opends.server.types.DebugLogLevel;
+import org.opends.server.types.*;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
@@ -238,7 +235,7 @@
Entry entry = null;
try
{
- entry = JebFormat.entryFromDatabase(data.getData(),
+ entry = ID2Entry.entryFromDatabase(ByteString.wrap(data.getData()),
entryContainer.getRootContainer().getCompressedSchema());
}
catch (Exception e)
--
Gitblit v1.10.0