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 2019/06/22 12:11:04 UTC
svn commit: r1861854 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java
Author: tilman
Date: Sat Jun 22 12:11:04 2019
New Revision: 1861854
URL: http://svn.apache.org/viewvc?rev=1861854&view=rev
Log:
PDFBOX-4071: Simplify code: null check for xobj isn't needed due to instanceof check; PDXObject.createXObject() never returns null for non-null argument.
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java?rev=1861854&r1=1861853&r2=1861854&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java Sat Jun 22 12:11:04 2019
@@ -202,39 +202,28 @@ public class ResourcesValidationProcess
protected void validateXObjects(PreflightContext context, PDResources resources) throws ValidationException
{
COSDictionary mapOfXObj = resources.getCOSObject().getCOSDictionary(COSName.XOBJECT);
- if (mapOfXObj != null)
+ if (mapOfXObj == null)
{
- for (Entry<COSName, COSBase> entry : mapOfXObj.entrySet())
+ return;
+ }
+ for (Entry<COSName, COSBase> entry : mapOfXObj.entrySet())
+ {
+ COSBase xobj = entry.getValue();
+ if (xobj instanceof COSObject)
+ {
+ xobj = ((COSObject) xobj).getObject();
+ }
+ if (xobj instanceof COSStream)
{
- COSBase xobj = entry.getValue();
- if (xobj != null)
+ try
+ {
+ PDXObject pdXObject = PDXObject.createXObject(xobj, resources);
+ ContextHelper.validateElement(context, pdXObject, GRAPHIC_PROCESS);
+ }
+ catch (IOException e)
{
- if (xobj instanceof COSObject)
- {
- xobj = ((COSObject) xobj).getObject();
- }
- if (xobj instanceof COSStream)
- {
- try
- {
- COSStream stream = (COSStream) xobj;
- PDXObject pdXObject = PDXObject.createXObject(stream, resources);
- if (pdXObject != null)
- {
- ContextHelper.validateElement(context, pdXObject, GRAPHIC_PROCESS);
- }
- else
- {
- ContextHelper.validateElement(context, stream, GRAPHIC_PROCESS);
- }
- }
- catch (IOException e)
- {
- context.addValidationError(new ValidationError(ERROR_GRAPHIC_MAIN,
- e.getMessage() + " for entry '"
- + entry.getKey().getName() + "'", e));
- }
- }
+ context.addValidationError(new ValidationError(ERROR_GRAPHIC_MAIN,
+ e.getMessage() + " for entry '" + entry.getKey().getName() + "'", e));
}
}
}