From 6276e230cb3cfcbb25f8dfe8123fcfd81d13d83c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jun 2016 13:50:18 +0000
Subject: [PATCH] OPENDJ-3037 inlined DirectoryServer methods that delegate to the schema
---
opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
index b66f09e..8f76c7a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
@@ -191,7 +191,7 @@
// Construct the trust store base entry.
LinkedHashMap<ObjectClass,String> objectClasses = new LinkedHashMap<>(2);
objectClasses.put(CoreSchema.getTopObjectClass(), OC_TOP);
- objectClasses.put(DirectoryServer.getObjectClass("ds-cfg-branch"), "ds-cfg-branch");
+ objectClasses.put(DirectoryServer.getSchema().getObjectClass("ds-cfg-branch"), "ds-cfg-branch");
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(1);
for (AVA ava : getBaseDN().rdn())
@@ -415,7 +415,7 @@
// Construct the certificate entry to return.
LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
ocMap.put(CoreSchema.getTopObjectClass(), OC_TOP);
- ocMap.put(DirectoryServer.getObjectClass(OC_CRYPTO_INSTANCE_KEY), OC_CRYPTO_INSTANCE_KEY);
+ ocMap.put(DirectoryServer.getSchema().getObjectClass(OC_CRYPTO_INSTANCE_KEY), OC_CRYPTO_INSTANCE_KEY);
LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(3);
@@ -1056,7 +1056,7 @@
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
}
- if (entry.hasObjectClass(DirectoryServer.getObjectClass(OC_SELF_SIGNED_CERT_REQUEST)))
+ if (entry.hasObjectClass(DirectoryServer.getSchema().getObjectClass(OC_SELF_SIGNED_CERT_REQUEST)))
{
try
{
--
Gitblit v1.10.0