From 6ba31b40d37b5026c1da21d797321d73df375e27 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 May 2016 08:44:30 +0000
Subject: [PATCH] OPENDJ-2987 DirectoryServer.getObjectClass(String, true) => DirectoryServer.getObjectClass2(String)
---
opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 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 d4d0cba..c4c536e 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
@@ -190,10 +190,7 @@
// Construct the trust store base entry.
LinkedHashMap<ObjectClass,String> objectClasses = new LinkedHashMap<>(2);
objectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
-
- ObjectClass branchOC =
- DirectoryServer.getObjectClass("ds-cfg-branch", true);
- objectClasses.put(branchOC, "ds-cfg-branch");
+ objectClasses.put(DirectoryServer.getObjectClass2("ds-cfg-branch"), "ds-cfg-branch");
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(1);
for (AVA ava : getBaseDN().rdn())
@@ -417,10 +414,7 @@
// Construct the certificate entry to return.
LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
-
- ObjectClass objectClass =
- DirectoryServer.getObjectClass(OC_CRYPTO_INSTANCE_KEY, true);
- ocMap.put(objectClass, OC_CRYPTO_INSTANCE_KEY);
+ ocMap.put(DirectoryServer.getObjectClass2(OC_CRYPTO_INSTANCE_KEY), OC_CRYPTO_INSTANCE_KEY);
LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(3);
@@ -1061,9 +1055,7 @@
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
}
- ObjectClass ocSelfSignedCertRequest =
- DirectoryServer.getObjectClass(OC_SELF_SIGNED_CERT_REQUEST, true);
- if (entry.hasObjectClass(ocSelfSignedCertRequest))
+ if (entry.hasObjectClass(DirectoryServer.getObjectClass2(OC_SELF_SIGNED_CERT_REQUEST)))
{
try
{
--
Gitblit v1.10.0