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/api/VirtualAttributeProvider.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/api/VirtualAttributeProvider.java b/opends/src/server/org/opends/server/api/VirtualAttributeProvider.java
index 9b1c147..65bbe41 100644
--- a/opends/src/server/org/opends/server/api/VirtualAttributeProvider.java
+++ b/opends/src/server/org/opends/server/api/VirtualAttributeProvider.java
@@ -37,13 +37,7 @@
import org.opends.server.admin.std.server.VirtualAttributeCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.core.SearchOperation;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ConditionResult;
-import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.Entry;
-import org.opends.server.types.InitializationException;
-import org.opends.server.types.VirtualAttributeRule;
+import org.opends.server.types.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
@@ -317,7 +311,7 @@
}
- ArrayList<ByteString> normalizedSubAny;
+ ArrayList<ByteSequence> normalizedSubAny;
if (subAny == null)
{
normalizedSubAny = null;
@@ -325,7 +319,7 @@
else
{
normalizedSubAny =
- new ArrayList<ByteString>(subAny.size());
+ new ArrayList<ByteSequence>(subAny.size());
for (ByteString subAnyElement : subAny)
{
try
--
Gitblit v1.10.0