[java-opensaml COMMIT] in /trunk: opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationInform...

[noreply at shibboleth.net]

Author: putmanb
Date: Mon Feb 23 20:22:06 2015
New Revision: 4236

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4236&view=rev
Log:
OSJ-109: BasicPKIXValidationInformation no longer allows a null verification depth 

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

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationInformation.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationInformation.java?rev=4236&r1=4235&r2=4236&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationInformation.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationInformation.java Mon Feb 23 20:22:06 2015
@@ -21,7 +21,6 @@
 import java.security.cert.X509Certificate;
 import java.util.Collection;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
@@ -34,7 +33,7 @@
      * 
      * @return maximum allowable trust chain verification depth
      */
-    @Nonnull public Integer getVerificationDepth();
+    @Nullable public Integer getVerificationDepth();
 
     /**
      * Gets the certificate trust anchors used during PKIX validation.

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=4236&r1=4235&r2=4236&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 Mon Feb 23 20:22:06 2015
@@ -21,7 +21,6 @@
 import java.security.cert.X509Certificate;
 import java.util.Collection;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.opensaml.security.x509.PKIXValidationInformation;
@@ -50,11 +49,7 @@
     public BasicPKIXValidationInformation(@Nullable final Collection<X509Certificate> anchors,
             @Nullable final Collection<X509CRL> crls, @Nullable final Integer depth) {
 
-        if (null == depth) {
-            verificationDepth = 1; 
-        } else {
-            verificationDepth = depth;
-        }
+        verificationDepth = depth;
         trustAnchors = anchors;
         trustedCRLs = crls;
     }
@@ -73,7 +68,7 @@
 
     /** {@inheritDoc} */
     @Override
-    @Nonnull public Integer getVerificationDepth() {
+    @Nullable public Integer getVerificationDepth() {
         return verificationDepth;
     }
 }