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/core/SearchOperationBasis.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/SearchOperationBasis.java b/opends/src/server/org/opends/server/core/SearchOperationBasis.java
index 2285719..f31ee88 100644
--- a/opends/src/server/org/opends/server/core/SearchOperationBasis.java
+++ b/opends/src/server/org/opends/server/core/SearchOperationBasis.java
@@ -42,7 +42,6 @@
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
import org.opends.server.types.operation.PostResponseSearchOperation;
@@ -300,7 +299,7 @@
this.attributes = attributes;
}
- rawBaseDN = new ASN1OctetString(baseDN.toString());
+ rawBaseDN = ByteString.valueOf(baseDN.toString());
rawFilter = new LDAPFilter(filter);
@@ -620,7 +619,7 @@
(f.getAttributeType().isObjectClassType()))
{
AttributeValue v = f.getAssertionValue();
- if (toLowerCase(v.getStringValue()).equals("ldapsubentry"))
+ if (toLowerCase(v.getValue().toString()).equals("ldapsubentry"))
{
setReturnLDAPSubentries(true);
}
@@ -633,7 +632,7 @@
if (t.isObjectClassType())
{
AttributeValue v = filter.getAssertionValue();
- if (toLowerCase(v.getStringValue()).equals("ldapsubentry"))
+ if (toLowerCase(v.getValue().toString()).equals("ldapsubentry"))
{
setReturnLDAPSubentries(true);
}
@@ -729,8 +728,8 @@
while (ocIterator.hasNext())
{
String ocName = ocIterator.next();
- AttributeValue v = new AttributeValue(attrType,
- new ASN1OctetString(ocName));
+ AttributeValue v =
+ AttributeValues.create(attrType,ocName);
if (! matchedValuesControl.valueMatches(attrType, v))
{
ocIterator.remove();
--
Gitblit v1.10.0