You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2022/02/28 15:59:20 UTC

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

Author: lehmi
Date: Mon Feb 28 15:59:19 2022
New Revision: 1898482

URL: http://svn.apache.org/viewvc?rev=1898482&view=rev
Log:
PDFBOX-5286: simplify

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=1898482&r1=1898481&r2=1898482&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 Mon Feb 28 15:59:19 2022
@@ -1106,23 +1106,8 @@ public class COSWriter implements ICOSVi
             }
             else if( current instanceof COSObject )
             {
-                COSBase subValue = ((COSObject)current).getObject();
-                if (willEncrypt || incrementalUpdate //
-                        || subValue instanceof COSDictionary //
-                        || subValue instanceof COSArray //
-                        || subValue == null)
-                {
-                    // PDFBOX-4308: added willEncrypt to prevent an object
-                    // that is referenced several times from being written
-                    // direct and indirect, thus getting encrypted
-                    // with wrong object number or getting encrypted twice
-                    addObjectToWrite( current );
-                    writeReference( current );
-                }
-                else
-                {
-                    subValue.accept( this );
-                }
+                addObjectToWrite(current);
+                writeReference(current);
             }
             else if( current == null )
             {
@@ -1209,23 +1194,8 @@ public class COSWriter implements ICOSVi
                 }
                 else if( value instanceof COSObject )
                 {
-                    COSBase subValue = ((COSObject)value).getObject();
-                    if (willEncrypt || incrementalUpdate //
-                            || subValue instanceof COSDictionary //
-                            || subValue instanceof COSArray //
-                            || subValue == null)
-                    {
-                        // PDFBOX-4308: added willEncrypt to prevent an object
-                        // that is referenced several times from being written
-                        // direct and indirect, thus getting encrypted
-                        // with wrong object number or getting encrypted twice
-                        addObjectToWrite( value );
-                        writeReference( value );
-                    }
-                    else
-                    {
-                        subValue.accept( this );
-                    }
+                    addObjectToWrite(value);
+                    writeReference(value);
                 }
                 else
                 {