Merge ASN1 branch to trunk

matthew_swift

05.42.2009 22094368c2865dcfb6daf8366425212b721a4657

 opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java

@@ -41,13 +41,9 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ByteString;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;


import org.opends.server.types.ResultCode;
import org.opends.server.types.*;

import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
@@ -99,7 +95,7 @@
    {
      // Make sure that the value is valid.
      value.getNormalizedValue();
      return value.getStringValue();
      return value.getValue().toString();
    }
  };

@@ -291,10 +287,10 @@
   * @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)
  {
    if (allowZeroLengthValues || (value.value().length > 0))
    if (allowZeroLengthValues || (value.length() > 0))
    {
      return true;
    }