[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryption...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Feb 27 18:24:38 2015
New Revision: 4244

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4244&view=rev
Log:
Clean up some logic.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java?rev=4244&r1=4243&r2=4244&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java Fri Feb 27 18:24:38 2015
@@ -325,14 +325,13 @@
                         && credentialSupportsEncryptionMethod(keyTransportCredential, encryptionMethod)
                         && evaluateEncryptionMethodChildren(encryptionMethod, criteria, whitelistBlacklistPredicate)) {
                     
+                    boolean accepted = true;
                     if (keyTransportPredicate != null) {
-                        if (keyTransportPredicate.apply(new KeyTransportAlgorithmPredicate.SelectionInput(
-                                algorithm, dataEncryptionAlgorithm, keyTransportCredential))) {
-                            log.debug("Resolved key transport algorithm URI from SAML metadata EncryptionMethod: {}",
-                                    algorithm);
-                            return new Pair<>(algorithm, encryptionMethod);
-                        }
-                    } else {
+                        accepted = keyTransportPredicate.apply(new KeyTransportAlgorithmPredicate.SelectionInput(
+                                algorithm, dataEncryptionAlgorithm, keyTransportCredential));
+                    }
+                    
+                    if (accepted) {
                         log.debug("Resolved key transport algorithm URI from SAML metadata EncryptionMethod: {}",
                                 algorithm);
                         return new Pair<>(algorithm, encryptionMethod);