svn commit: r1891663 - /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/StreamValidationProcess.java

[tilman]

Author: tilman
Date: Mon Jul 19 18:33:31 2021
New Revision: 1891663

URL: http://svn.apache.org/viewvc?rev=1891663&view=rev
Log:
PDFBOX-4892: simplify code, as suggested by valerybokov

Modified:
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/StreamValidationProcess.java

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/StreamValidationProcess.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/StreamValidationProcess.java?rev=1891663&r1=1891662&r2=1891663&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/StreamValidationProcess.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/StreamValidationProcess.java
 Mon Jul 19 18:33:31 2021
@@ -88,28 +88,25 @@ public class StreamValidationProcess ext
     protected void checkFilters(COSStream stream, PreflightContext context)
     {
         COSBase bFilter = stream.getDictionaryObject(COSName.FILTER);
-        if (bFilter != null)
+        if (bFilter instanceof COSArray)
         {
-            if (bFilter instanceof COSArray)
+            COSArray afName = (COSArray) bFilter;
+            for (int i = 0; i < afName.size(); ++i)
             {
-                COSArray afName = (COSArray) bFilter;
-                for (int i = 0; i < afName.size(); ++i)
-                {
-                    FilterHelper.isAuthorizedFilter(context, 
afName.getString(i));
-                }
-            }
-            else if (bFilter instanceof COSName)
-            {
-                String fName = ((COSName) bFilter).getName();
-                FilterHelper.isAuthorizedFilter(context, fName);
-            }
-            else
-            {
-                // ---- The filter type is invalid
-                addValidationError(context, new 
ValidationError(ERROR_SYNTAX_STREAM_INVALID_FILTER,
-                        "Filter should be a Name or an Array"));
+                FilterHelper.isAuthorizedFilter(context, afName.getString(i));
             }
         }
+        else if (bFilter instanceof COSName)
+        {
+            String fName = ((COSName) bFilter).getName();
+            FilterHelper.isAuthorizedFilter(context, fName);
+        }
+        else if (bFilter != null)
+        {
+            // ---- The filter type is invalid
+            addValidationError(context, new 
ValidationError(ERROR_SYNTAX_STREAM_INVALID_FILTER,
+                    "Filter should be a Name or an Array"));
+        }
         // else Filter entry is optional
     }