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/datamodel/ServerDescriptor.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
index b7f8bd1..154f863 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -537,8 +537,8 @@
return areAttributeTypesEqual(schema1, schema2)
&& areObjectClassesEqual(schema1, schema2)
- && Objects.equals(schema1.getMatchingRules(), schema2.getMatchingRules())
- && Objects.equals(schema1.getSyntaxes(), schema2.getSyntaxes());
+ && (schema1.getMatchingRules().size()==schema2.getMatchingRules().size() && schema1.getMatchingRules().containsAll(schema2.getMatchingRules()))
+ && (schema1.getSyntaxes().size()==schema2.getSyntaxes().size() && schema1.getSyntaxes().containsAll(schema2.getSyntaxes()));
}
private static boolean areAttributeTypesEqual(Schema schema1, Schema schema2)
--
Gitblit v1.10.0