You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2018/10/31 18:39:10 UTC

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

Author: tilman
Date: Wed Oct 31 18:39:10 2018
New Revision: 1845364

URL: http://svn.apache.org/viewvc?rev=1845364&view=rev
Log:
PDFBOX-3017: simplify code + use jdk7

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

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java?rev=1845364&r1=1845363&r2=1845364&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java Wed Oct 31 18:39:10 2018
@@ -142,18 +142,16 @@ public final class CRLVerifier
                 return;
             }
         }
+        catch (CertificateVerificationException ex)
+        {
+            throw ex;
+        }
         catch (Exception ex)
         {
-            if (ex instanceof CertificateVerificationException)
-            {
-                throw (CertificateVerificationException) ex;
-            }
-            else
-            {
-                throw new CertificateVerificationException(
-                        "Can not verify CRL for certificate: "
-                        + cert.getSubjectX500Principal(), ex);
-            }
+            throw new CertificateVerificationException(
+                    "Cannot verify CRL for certificate: "
+                    + cert.getSubjectX500Principal(), ex);
+
         }
     }
 
@@ -217,16 +215,9 @@ public final class CRLVerifier
     private static X509CRL downloadCRLFromWeb(String crlURL)
             throws IOException, CertificateException, CRLException
     {
-        URL url = new URL(crlURL);
-        InputStream crlStream = url.openStream();
-        try
-        {
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            return (X509CRL) cf.generateCRL(crlStream);
-        }
-        finally
+        try (InputStream crlStream = new URL(crlURL).openStream())
         {
-            crlStream.close();
+            return (X509CRL) CertificateFactory.getInstance("X.509").generateCRL(crlStream);
         }
     }