svn commit: r1929686 - pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser

[tilman]

Author: tilman
Date: Wed Nov 12 12:43:12 2025
New Revision: 1929686

Log:
PDFBOX-5660: simplify code, as suggested by Valery Bokov

Modified:
   
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java

Modified: 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
==============================================================================
--- 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
 Wed Nov 12 12:42:56 2025        (r1929685)
+++ 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
 Wed Nov 12 12:43:12 2025        (r1929686)
@@ -1865,27 +1865,21 @@ public class COSParser extends BaseParse
                     {
                         trailer.setItem(COSName.ROOT, rootObj);
                         trailer.setItem(COSName.INFO, infoObj);
-                        if (trailerDict.containsKey(COSName.ENCRYPT))
+                        COSObject encObj = 
trailerDict.getCOSObject(COSName.ENCRYPT);
+                        if (encObj != null)
                         {
-                            COSObject encObj = 
trailerDict.getCOSObject(COSName.ENCRYPT);
-                            if (encObj != null)
+                            // check if the dictionary can be dereferenced
+                            // TODO check if the dictionary is an encryption 
dictionary?
+                            COSDictionary encDict = 
retrieveCOSDictionary(encObj);
+                            if (encDict != null)
                             {
-                                // check if the dictionary can be dereferenced
-                                // TODO check if the dictionary is an 
encryption dictionary?
-                                COSDictionary encDict = 
retrieveCOSDictionary(encObj);
-                                if (encDict != null)
-                                {
-                                    trailer.setItem(COSName.ENCRYPT, encObj);
-                                }
+                                trailer.setItem(COSName.ENCRYPT, encObj);
                             }
                         }
-                        if (trailerDict.containsKey(COSName.ID))
+                        COSBase idObj = trailerDict.getItem(COSName.ID);
+                        if (idObj instanceof COSArray)
                         {
-                            COSBase idObj = trailerDict.getItem(COSName.ID);
-                            if (idObj instanceof COSArray)
-                            {
-                                trailer.setItem(COSName.ID, idObj);
-                            }
+                            trailer.setItem(COSName.ID, idObj);
                         }
                         return true;
                     }