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/BackupBackend.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
index 7292dad..ebabcfc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
@@ -212,10 +212,7 @@
// Construct the backup base entry.
LinkedHashMap<ObjectClass,String> objectClasses = new LinkedHashMap<>(2);
objectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
-
- ObjectClass untypedOC =
- DirectoryServer.getObjectClass(OC_UNTYPED_OBJECT_LC, true);
- objectClasses.put(untypedOC, OC_UNTYPED_OBJECT);
+ objectClasses.put(DirectoryServer.getObjectClass2(OC_UNTYPED_OBJECT_LC), OC_UNTYPED_OBJECT);
LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(1);
@@ -506,9 +503,7 @@
LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- ObjectClass backupDirOC =
- DirectoryServer.getObjectClass(OC_BACKUP_DIRECTORY, true);
- ocMap.put(backupDirOC, OC_BACKUP_DIRECTORY);
+ ocMap.put(DirectoryServer.getObjectClass2(OC_BACKUP_DIRECTORY), OC_BACKUP_DIRECTORY);
LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(3);
@@ -584,12 +579,8 @@
// Construct the backup entry to return.
LinkedHashMap<ObjectClass, String> ocMap = new LinkedHashMap<>(3);
ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
-
- ObjectClass oc = DirectoryServer.getObjectClass(OC_BACKUP_INFO, true);
- ocMap.put(oc, OC_BACKUP_INFO);
-
- oc = DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC, true);
- ocMap.put(oc, OC_EXTENSIBLE_OBJECT);
+ ocMap.put(DirectoryServer.getObjectClass2(OC_BACKUP_INFO), OC_BACKUP_INFO);
+ ocMap.put(DirectoryServer.getObjectClass2(OC_EXTENSIBLE_OBJECT_LC), OC_EXTENSIBLE_OBJECT);
LinkedHashMap<AttributeType, List<Attribute>> opAttrs = new LinkedHashMap<>(0);
LinkedHashMap<AttributeType, List<Attribute>> userAttrs = new LinkedHashMap<>();
--
Gitblit v1.10.0