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/schema/RFC3672SubtreeSpecificationSyntax.java |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java b/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java
index 798ab11..3328aad 100644
--- a/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java
+++ b/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java
@@ -29,7 +29,6 @@
 import static org.opends.server.loggers.debug.DebugLogger.*;
 import org.opends.server.loggers.debug.DebugTracer;
 import static org.opends.server.loggers.ErrorLogger.logError;
-import org.opends.server.types.DebugLogLevel;
 import static org.opends.messages.SchemaMessages.*;
 import org.opends.messages.MessageBuilder;
 import static org.opends.server.schema.SchemaConstants.*;
@@ -44,11 +43,7 @@
 import org.opends.server.config.ConfigException;
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.core.RFC3672SubtreeSpecification;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.DN;
-
+import org.opends.server.types.*;
 
 
 /**
@@ -113,7 +108,7 @@
     public RFC3672SubtreeSpecification decode(AttributeValue value)
         throws DirectoryException {
       return RFC3672SubtreeSpecification.valueOf(rootDN, value
-          .getStringValue());
+          .getValue().toString());
     }
   }
 
@@ -254,12 +249,12 @@
    * @return <CODE>true</CODE> if the provided value is acceptable for
    *         use with this syntax, or <CODE>false</CODE> if not.
    */
-  public boolean valueIsAcceptable(ByteString value,
+  public boolean valueIsAcceptable(ByteSequence value,
                                    MessageBuilder invalidReason) {
 
     // Use the subtree specification code to make this determination.
     try {
-      RFC3672SubtreeSpecification.valueOf(DN.nullDN(), value.stringValue());
+      RFC3672SubtreeSpecification.valueOf(DN.nullDN(), value.toString());
 
       return true;
     } catch (DirectoryException e) {

--
Gitblit v1.10.0