From 723de723b66bde827b15a2444f8ace5a2d304554 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Thu, 25 Jul 2024 16:44:47 +0300 Subject: [PATCH] [#187] FIX RFC3671: collective attribute values should be merged. Virtuals with other virtuals and reals values. --- .../src/main/java/org/opends/server/types/Entry.java | 5 ++--- 1 file 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 fb42c31bf3..0a33afb15d 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 @@ private void resolveCollectiveConflict( { 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; }