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 2014/12/19 10:44:37 UTC

svn commit: r1646657 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java

Author: tilman
Date: Fri Dec 19 09:44:36 2014
New Revision: 1646657

URL: http://svn.apache.org/r1646657
Log:
PDFBOX-2576: getSecurityHandler() never returns null

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java?rev=1646657&r1=1646656&r2=1646657&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java Fri Dec 19 09:44:36 2014
@@ -1300,15 +1300,8 @@ public class COSWriter implements ICOSVi
             if (document.getEncryption() != null)
             {
                 SecurityHandler securityHandler = document.getEncryption().getSecurityHandler();
-                if(securityHandler != null)
-                {
-                    securityHandler.prepareDocumentForEncryption(document);
-                    willEncrypt = true;
-                }
-                else
-                {
-                    willEncrypt = false;
-                }
+                securityHandler.prepareDocumentForEncryption(document);
+                willEncrypt = true;
             }
             else
             {