[java-opensaml COMMIT] /trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersRe...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Sep 19 18:48:51 2014
New Revision: 4025

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4025&view=rev
Log:
Check for and short-circuit resolution loops if RSAOAEPParameters is already completely resolved.

Modified:
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java?rev=4025&r1=4024&r2=4025&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java Fri Sep 19 18:48:51 2014
@@ -347,10 +347,14 @@
      * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the 
      *          candidate data encryption and key transport algorithm URIs
      */
-    // Checkstyle: CyclomaticComplexity -- more readable not split up
+    // Checkstyle: CyclomaticComplexity OFF -- more readable not split up
     protected void populateRSAOAEPParams(@Nonnull final RSAOAEPParameters rsaParams, 
             @Nonnull final CriteriaSet criteria,
             @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+        
+        if (rsaParams.isComplete()) {
+            return;
+        }
         
         Predicate<String> algoSupportPredicate = getAlgorithmRuntimeSupportedPredicate();
         
@@ -379,6 +383,9 @@
                 }
             }
             
+            if (rsaParams.isComplete()) {
+                return;
+            }
         }
     }
     // Checkstyle:CyclomaticComplexity ON