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 2019/11/15 19:03:54 UTC
svn commit: r1869875 - in
/pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature:
TSAClient.java cert/CertificateVerifier.java
Author: tilman
Date: Fri Nov 15 19:03:54 2019
New Revision: 1869875
URL: http://svn.apache.org/viewvc?rev=1869875&view=rev
Log:
PDFBOX-3017: use try-with-resources
Modified:
pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
Modified: pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java?rev=1869875&r1=1869874&r2=1869875&view=diff
==============================================================================
--- pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java (original)
+++ pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java Fri Nov 15 19:03:54 2019
@@ -132,30 +132,18 @@ public class TSAClient
}
// read response
- OutputStream output = null;
- try
+ try (OutputStream output = connection.getOutputStream())
{
- output = connection.getOutputStream();
output.write(request);
}
- finally
- {
- IOUtils.closeQuietly(output);
- }
LOG.debug("Waiting for response from TSA server");
- InputStream input = null;
byte[] response;
- try
+ try (InputStream input = connection.getInputStream())
{
- input = connection.getInputStream();
response = IOUtils.toByteArray(input);
}
- finally
- {
- IOUtils.closeQuietly(input);
- }
LOG.debug("Received response from TSA server");
Modified: pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java?rev=1869875&r1=1869874&r2=1869875&view=diff
==============================================================================
--- pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java (original)
+++ pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java Fri Nov 15 19:03:54 2019
@@ -47,7 +47,6 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.pdmodel.encryption.SecurityProvider;
import org.bouncycastle.asn1.ASN1Encodable;
import org.bouncycastle.asn1.ASN1OctetString;
@@ -292,12 +291,10 @@ public final class CertificateVerifier
}
ASN1TaggedObject location = (ASN1TaggedObject) obj.getObjectAt(1);
ASN1OctetString uri = (ASN1OctetString) location.getObject();
- InputStream in = null;
- try
+ String urlString = new String(uri.getOctets());
+ LOG.info("CA issuers URL: " + urlString);
+ try (InputStream in = new URL(urlString).openStream())
{
- String urlString = new String(uri.getOctets());
- LOG.info("CA issuers URL: " + urlString);
- in = new URL(urlString).openStream();
CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
Collection<? extends Certificate> altCerts = certFactory.generateCertificates(in);
altCerts.forEach(altCert -> resultSet.add((X509Certificate) altCert));
@@ -307,10 +304,6 @@ public final class CertificateVerifier
{
LOG.warn(ex.getMessage(), ex);
}
- finally
- {
- IOUtils.closeQuietly(in);
- }
}
LOG.info("CA issuers: Downloaded " + resultSet.size() + " certificate(s) total");
return resultSet;