Merge ASN1 branch to trunk

matthew_swift

05.42.2009 35c5f651a0c5c658a4bc67614e815405fcc6a830

 opendj-sdk/opends/src/server/org/opends/server/admin/ACIPropertyDefinition.java

@@ -30,8 +30,8 @@
import org.opends.server.authorization.dseecompat.Aci;
import org.opends.server.authorization.dseecompat.AciException;
import org.opends.server.types.DN;
import org.opends.server.types.ByteString;
import static org.opends.server.util.Validator.ensureNotNull;
import org.opends.server.protocols.asn1.ASN1OctetString;

import java.util.EnumSet;

@@ -116,7 +116,7 @@
    ensureNotNull(value);

    try {
      return Aci.decode(new ASN1OctetString(value), DN.NULL_DN);
      return Aci.decode(ByteString.valueOf(value), DN.NULL_DN);
    } catch (AciException e) {
      // TODO: it would be nice to throw the cause.
      throw new IllegalPropertyValueStringException(this, value);