[java-identity-provider] branch main updated: Simplify an expression.

[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=7da9659b240bfb312849c87a9b783f5f746636b3

The following commit(s) were added to refs/heads/main by this push:
       new  7da9659b2 Simplify an expression.
7da9659b2 is described below

commit 7da9659b240bfb312849c87a9b783f5f746636b3
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 7 20:14:04 2020 -0400

    Simplify an expression.
---
 .../src/main/resources/net/shibboleth/idp/conf/services-system.xml  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
index bc66b408b..ecbdabbe2 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
@@ -75,10 +75,8 @@
     </bean>
     <!-- Auto-append system config file to resource set. -->
     <bean id ="ExtendedAttributeRegistryResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
-          p:firstList-ref="#{
-                getObject('%{idp.service.attribute.registry.resources:shibboleth.AttributeRegistryResources}'.trim()) != null
-                    ? '%{idp.service.attribute.registry.resources:shibboleth.AttributeRegistryResources}'.trim()
-                        : 'shibboleth.DefaultAttributeRegistryResources' }" >
+          p:firstList="#{getObject('%{idp.service.attribute.registry.resources:shibboleth.AttributeRegistryResources}'.trim()) ?:
+                getObject('shibboleth.DefaultAttributeRegistryResources')}" >
         <property name="secondList">
             <util:list >
                 <value>classpath:/net/shibboleth/idp/conf/attribute-registry-system.xml</value>

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