From aab06371ebecd75d655436cf6045fffc8302c2e0 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 29 Jan 2016 15:01:26 +0000
Subject: [PATCH] *.java: Replaced DirectoryServer.getAttributeTypeOrNull(String) != null by DirectoryServer.getAttributeType(String).isPlaceHolder()
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
index 190abeb..84f6859 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
@@ -176,8 +176,8 @@
AttributeType thatType = rdn.getAttributeType(0);
if (!typePatterns[0].equals("*"))
{
- AttributeType thisType = DirectoryServer.getAttributeTypeOrNull(typePatterns[0]);
- if (thisType == null || !thisType.equals(thatType))
+ AttributeType thisType = DirectoryServer.getAttributeType(typePatterns[0]);
+ if (thisType.isPlaceHolder() || !thisType.equals(thatType))
{
return false;
}
@@ -208,8 +208,8 @@
for (int i = 0; i < numValues; i++)
{
- AttributeType type = DirectoryServer.getAttributeTypeOrNull(typePatterns[i]);
- if (type == null)
+ AttributeType type = DirectoryServer.getAttributeType(typePatterns[i]);
+ if (type.isPlaceHolder())
{
return false;
}
--
Gitblit v1.10.0