svn commit: r1847911 - /pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java

[tilman]

Author: tilman
Date: Sat Dec  1 19:09:47 2018
New Revision: 1847911

URL: http://svn.apache.org/viewvc?rev=1847911&view=rev
Log:
PDFBOX-3017: less nesting

Modified:
    
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java

Modified: 
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java?rev=1847911&r1=1847910&r2=1847911&view=diff
==============================================================================
--- 
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
 (original)
+++ 
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
 Sat Dec  1 19:09:47 2018
@@ -313,33 +313,33 @@ public final class CertificateVerifier
             // AccessDescription
             ASN1Sequence obj = (ASN1Sequence) objects.nextElement();
             ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier) 
obj.getObjectAt(0);
-            if (oid.equals(X509ObjectIdentifiers.id_ad_caIssuers))
+            if (!oid.equals(X509ObjectIdentifiers.id_ad_caIssuers))
             {
-                DERTaggedObject location = (DERTaggedObject) 
obj.getObjectAt(1);
-                DEROctetString uri = (DEROctetString) location.getObject();
-                InputStream in = null;
-                try
-                {
-                    URL certUrl = new URL(new String(uri.getOctets()));
-                    LOG.info("CA issuers URL: " + certUrl);
-                    CertificateFactory certFactory = 
CertificateFactory.getInstance("X.509");
-
-                    in = certUrl.openStream();
-                    Collection<? extends Certificate> altCerts = 
certFactory.generateCertificates(in);
-                    for (Certificate altCert : altCerts)
-                    {
-                        resultSet.add((X509Certificate) altCert);
-                    }
-                    LOG.info("CA issuers URL: " + altCerts.size() + " 
certificate(s) downloaded");
-                }
-                catch (IOException | CertificateException ex)
-                {
-                    LOG.warn(ex.getMessage(), ex);
-                }
-                finally
+                continue;
+            }
+            DERTaggedObject location = (DERTaggedObject) obj.getObjectAt(1);
+            DEROctetString uri = (DEROctetString) location.getObject();
+            InputStream in = null;
+            try
+            {
+                URL certUrl = new URL(new String(uri.getOctets()));
+                LOG.info("CA issuers URL: " + certUrl);
+                CertificateFactory certFactory = 
CertificateFactory.getInstance("X.509");
+                in = certUrl.openStream();
+                Collection<? extends Certificate> altCerts = 
certFactory.generateCertificates(in);
+                for (Certificate altCert : altCerts)
                 {
-                    IOUtils.closeQuietly(in);
+                    resultSet.add((X509Certificate) altCert);
                 }
+                LOG.info("CA issuers URL: " + altCerts.size() + " 
certificate(s) downloaded");
+            }
+            catch (IOException | CertificateException ex)
+            {
+                LOG.warn(ex.getMessage(), ex);
+            }
+            finally
+            {
+                IOUtils.closeQuietly(in);
             }
         }
         LOG.info("CA issuers: Downloaded " + resultSet.size() + " 
certificate(s) total");