From ba663b53d933130d2b6a68c1644e5744428dd1d6 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Nov 2016 11:41:50 +0000
Subject: [PATCH] Manual fixes/changes post inlining DirectoryServer.getSchema()
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 fb17661..5849874 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
@@ -34,6 +34,7 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.ServerContext;
import org.opends.server.types.Attribute;
import org.opends.server.types.Attributes;
import org.opends.server.types.DirectoryException;
@@ -144,6 +145,7 @@
*/
public boolean matchesRDN(RDN rdn)
{
+ ServerContext serverContext = DirectoryServer.getInstance().getServerContext();
if (getNumValues() == 1)
{
// Check for ",*," matching any RDN.
@@ -160,7 +162,7 @@
AVA ava = rdn.getFirstAVA();
if (!typePatterns[0].equals("*"))
{
- AttributeType thisType = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(typePatterns[0]);
+ AttributeType thisType = serverContext.getSchema().getAttributeType(typePatterns[0]);
if (thisType.isPlaceHolder() || !thisType.equals(ava.getAttributeType()))
{
return false;
@@ -179,7 +181,7 @@
TreeMap<String, List<ByteString>> patternMap = new TreeMap<>();
for (int i = 0; i < typePatterns.length; i++)
{
- AttributeType type = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(typePatterns[i]);
+ AttributeType type = serverContext.getSchema().getAttributeType(typePatterns[i]);
if (type.isPlaceHolder())
{
return false;
--
Gitblit v1.10.0