[java-opensaml COMMIT] /trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509Credential...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 30 15:21:18 2016
New Revision: 4593

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4593&view=rev
Log:
Add c'tor variant.

Modified:
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java

Modified: trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java?rev=4593&r1=4592&r2=4593&view=diff
==============================================================================
--- trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java	(original)
+++ trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java	Fri Dec 30 15:21:18 2016
@@ -63,10 +63,18 @@
      * @param resolver credential resolver used to resolve trusted credentials
      */
     public PKIXX509CredentialTrustEngine(@Nonnull final PKIXValidationInformationResolver resolver) {
-        pkixResolver = Constraint.isNotNull(resolver, "PKIX trust information resolver cannot be null");
-
-        pkixTrustEvaluator = new CertPathPKIXTrustEvaluator();
-        credNameEvaluator = new BasicX509CredentialNameEvaluator();
+        this(resolver, new CertPathPKIXTrustEvaluator(), new BasicX509CredentialNameEvaluator());
+    }
+    
+    /**
+     * Constructor.
+     * 
+     * @param resolver credential resolver used to resolve trusted credentials
+     * @param nameEvaluator the X.509 credential name evaluator to use (may be null)
+     */
+    public PKIXX509CredentialTrustEngine(@Nonnull final PKIXValidationInformationResolver resolver,
+            @Nullable final X509CredentialNameEvaluator nameEvaluator) {
+        this(resolver, new CertPathPKIXTrustEvaluator(), null);
     }
     
     /**