From 377b2709c64b32fe93905b466482216c2cc0581c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 19 Mar 2014 16:30:32 +0000
Subject: [PATCH] OPENDJ-1368 (CR-3232) Remove AttributeValue
---
opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
index 0743bd0..5ab1b49 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
@@ -38,6 +38,7 @@
import java.util.regex.PatternSyntaxException;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DereferenceAliasesPolicy;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.admin.server.ConfigurationChangeListener;
@@ -200,8 +201,7 @@
SearchFilter filter;
if (attributeTypes.length == 1)
{
- AttributeValue value =
- AttributeValues.create(attributeTypes[0], processedID);
+ ByteString value = ByteString.valueOf(processedID);
filter = SearchFilter.createEqualityFilter(attributeTypes[0], value);
}
else
@@ -210,7 +210,7 @@
new ArrayList<SearchFilter>(attributeTypes.length);
for (AttributeType t : attributeTypes)
{
- AttributeValue value = AttributeValues.create(t, processedID);
+ ByteString value = ByteString.valueOf(processedID);
filterComps.add(SearchFilter.createEqualityFilter(t, value));
}
@@ -290,15 +290,7 @@
}
}
-
- if (matchingEntry == null)
- {
- return null;
- }
- else
- {
- return matchingEntry;
- }
+ return matchingEntry;
}
--
Gitblit v1.10.0