Skip to content

Commit

Permalink
[OpenIdentityPlatform#187] FIX RFC3671: collective attribute values s…
Browse files Browse the repository at this point in the history
…hould be merged. Virtuals with other virtuals and reals values.
  • Loading branch information
vharseko committed Jul 25, 2024
1 parent fb639e6 commit 723de72
Showing 1 changed file with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 723de72

Please sign in to comment.