From 3d4c0acccda6e62b23f248d75c1cc6721fc20bdf Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jun 2016 13:51:21 +0000
Subject: [PATCH] OPENDJ-3037 inlined DirectoryServer.getAttributeType(String)
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index b2706c2..a5ba0c6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -765,7 +765,7 @@
final SearchResultEntry resultEntry = getFirstResult(searchOperation);
if (resultEntry != null)
{
- AttributeType synchronizationGenIDType = DirectoryServer.getAttributeType(REPLICATION_GENERATION_ID);
+ AttributeType synchronizationGenIDType = DirectoryServer.getSchema().getAttributeType(REPLICATION_GENERATION_ID);
List<Attribute> attrs = resultEntry.getAttribute(synchronizationGenIDType);
if (!attrs.isEmpty())
{
@@ -786,7 +786,7 @@
private Iterator<ByteString> getAttributeValueIterator(SearchResultEntry resultEntry, String attrName)
{
- AttributeType attrType = DirectoryServer.getAttributeType(attrName);
+ AttributeType attrType = DirectoryServer.getSchema().getAttributeType(attrName);
List<Attribute> exclAttrs = resultEntry.getAttribute(attrType);
if (!exclAttrs.isEmpty())
{
@@ -1365,7 +1365,7 @@
Set<AttributeType> results = new HashSet<>();
for (String attrName : fractionalConcernedAttributes)
{
- results.add(DirectoryServer.getAttributeType(attrName));
+ results.add(DirectoryServer.getSchema().getAttributeType(attrName));
}
return results;
}
@@ -3289,8 +3289,7 @@
SearchResultEntry resultEntry = result.get(0);
if (resultEntry != null)
{
- AttributeType synchronizationGenIDType = DirectoryServer.getAttributeType(REPLICATION_GENERATION_ID);
- List<Attribute> attrs = resultEntry.getAttribute(synchronizationGenIDType);
+ List<Attribute> attrs = resultEntry.getAttribute(REPLICATION_GENERATION_ID);
if (!attrs.isEmpty())
{
Attribute attr = attrs.get(0);
@@ -3442,7 +3441,7 @@
Set<AttributeType> includeAttributes = new HashSet<>();
for (String attrName : includeAttributeStrings)
{
- includeAttributes.add(DirectoryServer.getAttributeType(attrName));
+ includeAttributes.add(DirectoryServer.getSchema().getAttributeType(attrName));
}
exportConfig.setIncludeAttributes(includeAttributes);
}
--
Gitblit v1.10.0