From af105fd6f3de045f55081c0caab704a9854fa5af Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Tue, 16 Jul 2024 12:39:46 +0000
Subject: [PATCH] [#148,#261,#282] FIX control-panel schema errors in remote mode (#359)
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
index b353a5e..17bfc9d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
@@ -81,17 +81,17 @@
// Add missing matching rules and attribute syntaxes to base schema to allow read of remote server schema
// (see OPENDJ-1122 for more details)
- //SchemaHandler.addServerSyntaxesAndMatchingRules(schemaBuilder);
+ SchemaHandler.addServerSyntaxesAndMatchingRules(schemaBuilder);
// Add remote schema entry
final SearchRequest request = newSearchRequest(
DN.valueOf(DN_DEFAULT_SCHEMA_ROOT), BASE_OBJECT, Filter.alwaysTrue(),
ATTR_LDAP_SYNTAXES, ATTR_ATTRIBUTE_TYPES, ATTR_OBJECTCLASSES);
final SearchResultEntry entry = connWrapper.getConnection().searchSingleEntry(request);
- removeNonOpenDjOrOpenDsSyntaxes(entry);
- new SchemaBuilder(getBaseSchema()).addSchema(entry, true);
+ //removeNonOpenDjOrOpenDsSyntaxes(entry);
+ schemaBuilder.addSchema(entry, true);
- return buildSchema(schemaBuilder);
+ return schemaBuilder.toSchema();
}
--
Gitblit v1.10.0