svn commit: r1844430 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java

[tilman]

Author: tilman
Date: Sat Oct 20 17:26:51 2018
New Revision: 1844430

URL: http://svn.apache.org/viewvc?rev=1844430&view=rev
Log:
PDFBOX-4357: refactor last commit; root is never null

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

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1844430&r1=1844429&r2=1844430&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java 
(original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java 
Sat Oct 20 17:26:51 2018
@@ -2282,7 +2282,7 @@ public class COSParser extends BaseParse
      */
     protected void checkPages(COSDictionary root) throws IOException
     {
-        if (trailerWasRebuild && root != null)
+        if (trailerWasRebuild)
         {
             // check if all page objects are dereferenced
             COSBase pages = root.getDictionaryObject(COSName.PAGES);
@@ -2290,15 +2290,10 @@ public class COSParser extends BaseParse
             {
                 checkPagesDictionary((COSDictionary) pages, new 
HashSet<COSObject>());
             }
-
-            if (pages instanceof COSObject)
-            {
-                pages = ((COSObject) pages).getObject();
-            }
-            if (pages == null || pages instanceof COSNull)
-            {
-                throw new IOException("Page tree root is null");
-            }
+        }
+        if (root.getDictionaryObject(COSName.PAGES) == null)
+        {
+            throw new IOException("Page tree root is null");
         }
     }