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/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
index b5a581d..00cdb82 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
@@ -32,12 +32,12 @@
import org.opends.messages.Message;
import org.opends.server.protocols.asn1.ASN1Exception;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.ldap.CompareRequestProtocolOp;
import org.opends.server.protocols.ldap.CompareResponseProtocolOp;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.ProtocolOp;
import org.opends.server.tools.LDAPConnection;
+import org.opends.server.types.ByteString;
import org.opends.server.types.LDAPException;
@@ -87,10 +87,8 @@
// Read the attribute name and value for the compare request.
AttributeValueAssertion attrValAssertion = compareRequest.getAssertion();
String attrName = attrValAssertion.getName();
- ASN1OctetString attrValue =
- new ASN1OctetString(attrValAssertion.getValue());
-
- ASN1OctetString dnStr = new ASN1OctetString(compareRequest.getDn());
+ ByteString attrValue = ByteString.valueOf(attrValAssertion.getValue());
+ ByteString dnStr = ByteString.valueOf(compareRequest.getDn());
// Create and send the LDAP compare request to the server.
ProtocolOp op = new CompareRequestProtocolOp(dnStr, attrName, attrValue);
--
Gitblit v1.10.0