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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jul  3 09:49:21 2014
New Revision: 3944

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3944&view=rev
Log:
IDP-390 depth becomes @Nullable with a default of 1

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

Modified: trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicPKIXValidationInformation.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicPKIXValidationInformation.java?rev=3944&r1=3943&r2=3944&view=diff
==============================================================================
--- trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicPKIXValidationInformation.java (original)
+++ trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicPKIXValidationInformation.java Thu Jul  3 09:49:21 2014
@@ -24,8 +24,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
 import org.opensaml.security.x509.PKIXValidationInformation;
 
 /**
@@ -50,24 +48,31 @@
      * @param depth max verification path depth
      */
     public BasicPKIXValidationInformation(@Nullable final Collection<X509Certificate> anchors,
-            @Nullable final Collection<X509CRL> crls, @Nonnull final Integer depth) {
+            @Nullable final Collection<X509CRL> crls, @Nullable final Integer depth) {
 
-        verificationDepth = Constraint.isNotNull(depth, "Verification depth cannot be null");
+        if (null == depth) {
+            verificationDepth = 1; 
+        } else {
+            verificationDepth = depth;
+        }
         trustAnchors = anchors;
         trustedCRLs = crls;
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nullable public Collection<X509CRL> getCRLs() {
         return trustedCRLs;
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nullable public Collection<X509Certificate> getCertificates() {
         return trustAnchors;
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nonnull public Integer getVerificationDepth() {
         return verificationDepth;
     }