You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2015/03/17 16:28:13 UTC

svn commit: r1667332 - /pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Encrypt.java

Author: msahyoun
Date: Tue Mar 17 15:28:13 2015
New Revision: 1667332

URL: http://svn.apache.org/r1667332
Log:
PDFBOX-2576 ensure stream is closed on checked exception

Modified:
    pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Encrypt.java

Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Encrypt.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Encrypt.java?rev=1667332&r1=1667331&r2=1667332&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Encrypt.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Encrypt.java Tue Mar 17 15:28:13 2015
@@ -170,11 +170,21 @@ public class Encrypt
 
 
                         CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                        InputStream inStream = new FileInputStream(certFile);
-                        X509Certificate certificate = (X509Certificate)cf.generateCertificate(inStream);
-                        inStream.close();
-
-                        recip.setX509(certificate);
+                        
+                        InputStream inStream = null;
+                        try
+                        {
+                            inStream = new FileInputStream(certFile);
+                            X509Certificate certificate = (X509Certificate)cf.generateCertificate(inStream);
+                            recip.setX509(certificate);
+                        }
+                        finally
+                        {
+                            if (inStream != null)
+                            {
+                                inStream.close();
+                            }
+                        }                        
 
                         ppp.addRecipient(recip);