From 35c5f651a0c5c658a4bc67614e815405fcc6a830 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
---
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index 34dc4f1..6f3cc05 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -42,7 +42,6 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.backends.jeb.*;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.messages.Message;
import org.opends.messages.JebMessages;
import static org.opends.messages.JebMessages.*;
@@ -868,7 +867,7 @@
message = ERR_JEB_IMPORT_NO_WORKER_THREADS.get();
throw new JebException(message);
}
- DN dn = DN.decode(new ASN1OctetString(key.getData()));
+ DN dn = DN.decode(ByteString.wrap(key.getData()));
if(!context.getIncludeBranches().contains(dn)) {
EntryID id = new EntryID(data);
Entry entry =
--
Gitblit v1.10.0