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/authorization/dseecompat/Aci.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java b/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java
index 96df8da..a1acb5c 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java
@@ -28,8 +28,8 @@
package org.opends.server.authorization.dseecompat;
import org.opends.messages.Message;
-import org.opends.server.types.ByteString;
import org.opends.server.types.DN;
+import org.opends.server.types.ByteSequence;
import static org.opends.messages.AccessControlMessages.*;
import static org.opends.server.util.StaticUtils.isDigit;
@@ -362,9 +362,9 @@
* @return Returns a decoded ACI representing the string argument.
* @throws AciException If the parsing of the ACI string fails.
*/
- public static Aci decode (ByteString byteString, DN dn)
+ public static Aci decode (ByteSequence byteString, DN dn)
throws AciException {
- String input=byteString.stringValue();
+ String input=byteString.toString();
//Perform a quick pattern check against the string to catch any
//obvious syntax errors.
if (!Pattern.matches(aciRegex, input)) {
@@ -387,7 +387,7 @@
* @return A string representation of the ACI.
*/
public String toString() {
- return new String(aciString);
+ return aciString;
}
/**
--
Gitblit v1.10.0