From be3f8e0f16dcd056915bd9279bc33fca929b1c72 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Tue, 30 Jul 2024 10:54:36 +0000
Subject: [PATCH] [#187] FIX RFC3671: collective attribute values should be merged. Virtuals with other virtuals and real values. (#365)
---
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
index fb42c31..0a33afb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
@@ -13,6 +13,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2023-2024 3A Systems, LLC.
*/
package org.opends.server.types;
@@ -3027,9 +3028,7 @@
{
if (attrList.get(0).isVirtual())
{
- // The existing attribute is already virtual,
- // so we've got a different conflict, but we'll let the first win.
- // FIXME -- Should we handle this differently?
+ attrList.add(collectiveAttr);
return;
}
--
Gitblit v1.10.0