[java-identity-provider] branch master updated: IDP-1235 Always put an intermediate context in place, even when no prerequest happens

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/master by this push:
       new  fe98bd3   IDP-1235 Always put an intermediate context in place, even when no prerequest happens
fe98bd3 is described below

commit fe98bd34f082fc4d283a98016ecafa4bc48c3652
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Sep 25 14:37:56 2019 +0100

    IDP-1235 Always put an intermediate context in place, even when no prerequest happens
    
    https://issues.shibboleth.net/jira/browse/IDP-1235
---
 .../idp/attribute/resolver/impl/AttributeResolverImpl.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
index 1364b8e..6e02ddd 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
@@ -238,8 +238,9 @@ public class AttributeResolverImpl extends AbstractServiceableComponent<Attribut
                 for (final String attributeId : preRequestedAttributes) {
                     resolveAttributeDefinition(attributeId, resolutionContext);
                 }
-                attributeContext = finalizePreResolvedAttributes(resolutionContext);
+                finalizePreResolvedAttributes(resolutionContext);
             }
+            attributeContext = resolutionContext.getSubcontext(AttributeContext.class, true);
 
             boolean hasExportingDataConnector = false;
 
@@ -620,7 +621,7 @@ public class AttributeResolverImpl extends AbstractServiceableComponent<Attribut
      * @param resolutionContext current resolution context
      * @return a populated Attribute Context, or nothing
      */
-    @Nullable protected AttributeContext finalizePreResolvedAttributes(@Nonnull
+    @Nullable protected void  finalizePreResolvedAttributes(@Nonnull
             final AttributeResolutionContext resolutionContext) {
         Constraint.isNotNull(resolutionContext, "Attribute resolution context cannot be null");
         final AttributeResolverWorkContext workContext =
@@ -631,14 +632,13 @@ public class AttributeResolverImpl extends AbstractServiceableComponent<Attribut
         collectResolvedAttributes(resolvedAttributes, workContext, true);
 
         if (resolvedAttributes.isEmpty()) {
-            return null;
+            return;
         }
 
-        final AttributeContext context =  resolutionContext.getSubcontext(AttributeContext.class, true);
+        final AttributeContext context = resolutionContext.getSubcontext(AttributeContext.class, true);
         log.debug("Pre-resolved Attributes: {}", resolvedAttributes.keySet());
         context.setIdPAttributes(resolvedAttributes.values());
         context.setUnfilteredIdPAttributes(resolvedAttributes.values());
-        return context;
     }
 
     /** {@inheritDoc} */

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