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/admin/ACIPropertyDefinition.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/ACIPropertyDefinition.java b/opends/src/server/org/opends/server/admin/ACIPropertyDefinition.java
index 23bbc93..4c32e8c 100644
--- a/opends/src/server/org/opends/server/admin/ACIPropertyDefinition.java
+++ b/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);
--
Gitblit v1.10.0