[java-opensaml COMMIT] in /trunk: opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/Ba...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Nov  5 16:01:03 2014
New Revision: 4127

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4127&view=rev
Log:
Unit tests for PKIX dynamic trusted names support.

Added:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategyTest.java   (with props)
    trunk/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolverTest.java   (with props)
Modified:
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java

Modified: trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java?rev=4127&r1=4126&r2=4127&view=diff
==============================================================================
--- trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java (original)
+++ trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java Wed Nov  5 16:01:03 2014
@@ -90,7 +90,11 @@
     }
 
     /** {@inheritDoc} */
-    @Nullable public Set<String> resolveTrustedNames(CriteriaSet criteriaSet) throws ResolverException {
+    @Nullable public Set<String> resolveTrustedNames(@Nullable final CriteriaSet criteriaSet) throws ResolverException {
+        if (criteriaSet == null) {
+            return ImmutableSet.copyOf(trustedNames);
+        }
+        
         if (supportDynamicTrustedNames) {
             TrustedNamesCriterion criterion = criteriaSet.get(TrustedNamesCriterion.class);
             if (criterion != null) {