From 383ff591182ce9730728c938d9b86e95f86ad676 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:24 +0000
Subject: [PATCH] OPENDJ-3089 Update SchemaLoader and RemoteSchemaLoader to use SchemaHandler and SDK Schema
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromConnection.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromConnection.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromConnection.java
index 6c755e8..624d7ec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromConnection.java
@@ -50,6 +50,7 @@
import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.requests.SearchRequest;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
+import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldif.ConnectionEntryReader;
import org.forgerock.opendj.server.config.client.AdministrationConnectorCfgClient;
import org.forgerock.opendj.server.config.client.BackendCfgClient;
@@ -311,12 +312,12 @@
{
try
{
- readSchema(connWrapper);
- if (getSchema() != null)
+ Schema schema = readSchema(connWrapper);
+ if (schema != null)
{
// Update the schema: so that when we call the server code the
// latest schema read on the server we are managing is used.
- DirectoryServer.setSchema(getSchema());
+ DirectoryServer.setSchema(schema);
}
}
catch (OpenDsException oe)
@@ -629,20 +630,12 @@
* @throws OpenDsException
* if an error occurs reading the schema.
*/
- private void readSchema(ConnectionWrapper connWrapper) throws OpenDsException
+ private Schema readSchema(ConnectionWrapper connWrapper) throws OpenDsException
{
try
{
- if (isLocal)
- {
- super.readSchema();
- }
- else
- {
- RemoteSchemaLoader loader = new RemoteSchemaLoader();
- loader.readSchema(connWrapper);
- schema = loader.getSchema();
- }
+ schema = isLocal ? super.readSchema() : new RemoteSchemaLoader().readSchema(connWrapper);
+ return schema;
}
catch (LdapException e)
{
--
Gitblit v1.10.0