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/DN2URI.java | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/DN2URI.java b/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
index e2aed63..fbd5db1 100644
--- a/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
+++ b/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
@@ -33,20 +33,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ConditionResult;
-import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
-import org.opends.server.types.LDAPURL;
-import org.opends.server.types.Modification;
-import org.opends.server.types.ResultCode;
-import org.opends.server.types.SearchResultReference;
-import org.opends.server.types.SearchScope;
+import org.opends.server.types.*;
import org.opends.server.util.StaticUtils;
import java.io.UnsupportedEncodingException;
@@ -315,7 +302,7 @@
{
for (AttributeValue v : a)
{
- insert(txn, entryDN, v.getStringValue());
+ insert(txn, entryDN, v.getValue().toString());
}
}
break;
@@ -329,7 +316,7 @@
{
for (AttributeValue v : a)
{
- delete(txn, entryDN, v.getStringValue());
+ delete(txn, entryDN, v.getValue().toString());
}
}
break;
@@ -344,7 +331,7 @@
{
for (AttributeValue v : a)
{
- insert(txn, entryDN, v.getStringValue());
+ insert(txn, entryDN, v.getValue().toString());
}
}
break;
@@ -679,7 +666,7 @@
}
// We have found a subordinate referral.
- DN dn = DN.decode(new ASN1OctetString(key.getData()));
+ DN dn = DN.decode(ByteString.wrap(key.getData()));
// Make sure the referral is within scope.
if (searchOp.getScope() == SearchScope.SINGLE_LEVEL)
--
Gitblit v1.10.0