[java-identity-provider] branch maint-4 updated: IDP-2038 - AttributeContext unfiltered setter is checking wrong variable

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch maint-4
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=280ebdcfc0b2d4745d5271d2bbb0b8ac2a4bd3d6

The following commit(s) were added to refs/heads/maint-4 by this push:
     new 280ebdcfc IDP-2038 - AttributeContext unfiltered setter is checking wrong variable
280ebdcfc is described below

commit 280ebdcfc0b2d4745d5271d2bbb0b8ac2a4bd3d6
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 14 13:07:09 2022 -0500

    IDP-2038 - AttributeContext unfiltered setter is checking wrong variable
    
    https://shibboleth.atlassian.net/browse/IDP-2038
---
 .../java/net/shibboleth/idp/attribute/context/AttributeContext.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java
index ec47185ea..d8c622952 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java
@@ -42,10 +42,10 @@ import net.shibboleth.utilities.java.support.collection.CollectionSupport;
 public final class AttributeContext extends BaseContext {
 
     /** The attributes tracked by this context. */
-    @Nonnull private Map<String,IdPAttribute> attributes;
+    @Nonnull @NonnullElements private Map<String,IdPAttribute> attributes;
     
     /** The attributes tracked by this context prior to filtering. */
-    @Nullable private Map<String,IdPAttribute> unfilteredAttributes;
+    @Nullable @NonnullElements private Map<String,IdPAttribute> unfilteredAttributes;
     
     /** Whether attribute release consent was obtained from the subject. */
     private boolean consented;
@@ -107,7 +107,7 @@ public final class AttributeContext extends BaseContext {
      */
     @Nonnull public AttributeContext setUnfilteredIdPAttributes(
             @Nullable @NonnullElements final Collection<IdPAttribute> newAttributes) {
-        if (null != unfilteredAttributes) {
+        if (null != newAttributes) {
             unfilteredAttributes = newAttributes.
                     stream().
                     collect(Collectors.toUnmodifiableMap(IdPAttribute::getId,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.