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/21 11:04:02 UTC
svn commit: r1647116 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
Author: tilman
Date: Sun Dec 21 10:04:02 2014
New Revision: 1647116
URL: http://svn.apache.org/r1647116
Log:
PDFBOX-2576: combine and simplify nested if statement
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java?rev=1647116&r1=1647115&r2=1647116&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java Sun Dec 21 10:04:02 2014
@@ -1743,15 +1743,12 @@ public abstract class BaseParser
skipSpaces();
genNum = readGenerationNumber();
String objectKey = readString(3);
- if (!objectKey.equals("obj"))
+ if (!objectKey.equals("obj") && continueOnError && objectKey.equals("o"))
{
- if (!continueOnError || !objectKey.equals("o"))
- {
- throw new IOException("expected='obj' actual='" + objectKey + "' " + pdfSource);
- }
- //assume that "o" was meant to be "obj" (this is a workaround for
- // PDFBOX-773 attached PDF Andersens_Fairy_Tales.pdf).
+ throw new IOException("expected='obj' actual='" + objectKey + "' " + pdfSource);
}
+ //assume that "o" was meant to be "obj" (this is a workaround for
+ // PDFBOX-773 attached PDF Andersens_Fairy_Tales.pdf).
}
else
{