[java-shib-attribute] branch main updated: Restore null handling in alignment with base class.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=e9547f8f908ee2879c459a322c565d5d3301a734

The following commit(s) were added to refs/heads/main by this push:
     new e9547f8f9 Restore null handling in alignment with base class.
e9547f8f9 is described below

commit e9547f8f908ee2879c459a322c565d5d3301a734
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Nov 15 19:56:01 2022 -0500

    Restore null handling in alignment with base class.
---
 .../idp/attribute/resolver/dc/impl/ContextDerivedDataConnector.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ContextDerivedDataConnector.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ContextDerivedDataConnector.java
index f53af0d1c..d2f05a315 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ContextDerivedDataConnector.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ContextDerivedDataConnector.java
@@ -24,6 +24,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
@@ -106,7 +107,7 @@ public class ContextDerivedDataConnector extends AbstractDataConnector {
 
     /** {@inheritDoc} */
     @Override
-    @Nonnull @NonnullElements protected Map<String,IdPAttribute> doDataConnectorResolve(
+    @Nullable @NonnullElements protected Map<String,IdPAttribute> doDataConnectorResolve(
             @Nonnull final AttributeResolutionContext resolutionContext,
             @Nonnull final AttributeResolverWorkContext workContext) throws ResolutionException {
 
@@ -119,7 +120,7 @@ public class ContextDerivedDataConnector extends AbstractDataConnector {
                 throw new NoResultAnErrorResolutionException(getLogPrefix() + " No attributes returned");
             }
             log.debug("{} Generated no attributes", getLogPrefix());
-            return Collections.emptyMap();
+            return null;
         }
         
         log.debug("{} Generated {} attributes", getLogPrefix(), results.size());

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