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/plugins/ReferentialIntegrityPlugin.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 625f22f..6ed86d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -222,13 +222,10 @@
       String attr = attrFilt.substring(0, sepInd);
       String filtStr = attrFilt.substring(sepInd + 1);
 
-      AttributeType attrType =
-        DirectoryServer.getAttributeType(attr.toLowerCase());
-
+      AttributeType attrType = DirectoryServer.getAttributeTypeOrNull(attr.toLowerCase());
       try
       {
-        SearchFilter filter =
-          SearchFilter.createFilterFromString(filtStr);
+        SearchFilter filter = SearchFilter.createFilterFromString(filtStr);
         newAttrFiltMap.put(attrType, filter);
       }
       catch (DirectoryException de)
@@ -348,9 +345,7 @@
        * type has to be present in the attributeType list.
        */
 
-      AttributeType attrType =
-        DirectoryServer.getAttributeType(attr.toLowerCase());
-
+      AttributeType attrType = DirectoryServer.getAttributeTypeOrNull(attr.toLowerCase());
       if (attrType == null || !theAttributeTypes.contains(attrType))
       {
         isAcceptable = false;

--
Gitblit v1.10.0