From 4f6891a8bd4d017a41b5f75748398ff59787501c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 15 Oct 2015 19:38:35 +0000
Subject: [PATCH] Renamed DirectoryServer.getAttributeType() to DirectoryServer.getAttributeTypeOrNull().
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 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 ba6c5ee..50244f1 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
@@ -704,10 +704,8 @@
final SearchResultEntry resultEntry = getFirstResult(searchOperation);
if (resultEntry != null)
{
- AttributeType synchronizationGenIDType =
- DirectoryServer.getAttributeType(REPLICATION_GENERATION_ID);
- List<Attribute> attrs =
- resultEntry.getAttribute(synchronizationGenIDType);
+ AttributeType synchronizationGenIDType = DirectoryServer.getAttributeTypeOrNull(REPLICATION_GENERATION_ID);
+ List<Attribute> attrs = resultEntry.getAttribute(synchronizationGenIDType);
if (attrs != null)
{
Attribute attr = attrs.get(0);
@@ -725,10 +723,9 @@
return null;
}
- private Iterator<String> getAttributeValueIterator(
- SearchResultEntry resultEntry, String attrName)
+ private Iterator<String> getAttributeValueIterator(SearchResultEntry resultEntry, String attrName)
{
- AttributeType attrType = DirectoryServer.getAttributeType(attrName);
+ AttributeType attrType = DirectoryServer.getAttributeTypeOrNull(attrName);
List<Attribute> exclAttrs = resultEntry.getAttribute(attrType);
if (exclAttrs != null)
{
@@ -1142,7 +1139,7 @@
{
for (String attrName : attrNames)
{
- if (DirectoryServer.getAttributeType(attrName).equals(attrTypeToFind))
+ if (DirectoryServer.getAttributeTypeOrNull(attrName).equals(attrTypeToFind))
{
return true;
}
@@ -3282,10 +3279,8 @@
SearchResultEntry resultEntry = result.get(0);
if (resultEntry != null)
{
- AttributeType synchronizationGenIDType =
- DirectoryServer.getAttributeType(REPLICATION_GENERATION_ID);
- List<Attribute> attrs =
- resultEntry.getAttribute(synchronizationGenIDType);
+ AttributeType synchronizationGenIDType = DirectoryServer.getAttributeTypeOrNull(REPLICATION_GENERATION_ID);
+ List<Attribute> attrs = resultEntry.getAttribute(synchronizationGenIDType);
if (attrs != null)
{
Attribute attr = attrs.get(0);
--
Gitblit v1.10.0