PDFBOX-5660: simplify code, as suggested by Valery Bokov; closes #329
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1929684 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java b/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java
index 1c91088..1624a9b 100644
--- a/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java
+++ b/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java
@@ -417,23 +417,17 @@
{
trailer.setItem(COSName.ROOT, rootObj);
trailer.setItem(COSName.INFO, infoObj);
- if (trailerDict.containsKey(COSName.ENCRYPT))
+ COSObject encObj = trailerDict.getCOSObject(COSName.ENCRYPT);
+ // check if the dictionary can be dereferenced
+ // TODO check if the dictionary is an encryption dictionary?
+ if (encObj != null && encObj.getObject() instanceof COSDictionary)
{
- COSObject encObj = trailerDict.getCOSObject(COSName.ENCRYPT);
- // check if the dictionary can be dereferenced
- // TODO check if the dictionary is an encryption dictionary?
- if (encObj != null && encObj.getObject() instanceof COSDictionary)
- {
- 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;
}