[java-identity-provider] branch main updated: Move cleanup of context to finally clause.

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
     new 1fc8529c9 Move cleanup of context to finally clause.
1fc8529c9 is described below

commit 1fc8529c9e218964650f0b89fd0d324d02e8dfc8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 3 07:51:28 2025 -0400

    Move cleanup of context to finally clause.
---
 .../idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
index 40f9a03e8..e07cb5ef5 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
@@ -578,13 +578,14 @@ public class ValidateSAMLAuthentication extends AbstractValidationAction {
         try (final ServiceableComponent<AttributeFilter> component = service.getServiceableComponent()) {
             final AttributeFilter filter = component.getComponent();
             filter.filterAttributes(filterContext);
-            filterContext.removeFromParent();
             assert attributeContext!=null;
             attributeContext.setIdPAttributes(filterContext.getFilteredIdPAttributes());
         } catch (final AttributeFilterException e) {
             log.error("{} Error while filtering inbound attributes", getLogPrefix(), e);
         } catch (final ServiceException e) {
             log.error("{} Invalid AttributeFilter configuration", getLogPrefix(), e);
+        } finally {
+            filterContext.removeFromParent();
         }
     }
     

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