[java-identity-provider] branch master updated: IDP-465 - Handle upgrades without condition trigger

[Tom Zeller]

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

tzeller 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=e4d2b82684cbc5f2a4d52e619fc6511d48214acf

The following commit(s) were added to refs/heads/master by this push:
       new  e4d2b82   IDP-465 - Handle upgrades without condition trigger
e4d2b82 is described below

commit e4d2b82684cbc5f2a4d52e619fc6511d48214acf
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Sep 24 09:11:53 2018 -0500

    IDP-465 - Handle upgrades without condition trigger
    
    https://issues.shibboleth.net/jira/browse/IDP-465
---
 .../src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml
index c747bd4..cd23898 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml
@@ -23,7 +23,7 @@
     </action-state>
 
     <decision-state id="CheckConsentCondition">
-        <if test="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.consent.AttributeQuery.Condition').apply(opensamlProfileRequestContext)"
+        <if test="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.consent.AttributeQuery.Condition') and flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.consent.AttributeQuery.Condition').apply(opensamlProfileRequestContext)"
             then="ConsentSetup" else="ContinueProfileWork" />
     </decision-state>
 

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