svn commit: r1889584 - in /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight: graphic/ICCProfileWrapper.java process/CatalogValidationProcess.java

[tilman]

Author: tilman
Date: Fri May  7 03:43:21 2021
New Revision: 1889584

URL: http://svn.apache.org/viewvc?rev=1889584&view=rev
Log:
PDFBOX-4892: remove redundant null check for loops, as suggested by valerybokov

Modified:
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java?rev=1889584&r1=1889583&r2=1889584&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
 Fri May  7 03:43:21 2021
@@ -123,7 +123,11 @@ public class ICCProfileWrapper
         PDDocumentCatalog catalog = document.getDocumentCatalog();
         COSArray outputIntents = 
catalog.getCOSObject().getCOSArray(COSName.OUTPUT_INTENTS);
 
-        for (int i = 0; outputIntents != null && i < outputIntents.size(); ++i)
+        if (outputIntents == null)
+        {
+            return null;
+        }
+        for (int i = 0; i < outputIntents.size(); ++i)
         {
             COSDictionary outputIntentDict = (COSDictionary) 
outputIntents.getObject(i);
             COSBase destOutputProfile = outputIntentDict

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java?rev=1889584&r1=1889583&r2=1889584&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java
 Fri May  7 03:43:21 2021
@@ -192,7 +192,11 @@ public class CatalogValidationProcess ex
     {
         COSArray outputIntents = 
catalog.getCOSObject().getCOSArray(COSName.OUTPUT_INTENTS);
         Map<COSObjectKey, Boolean> tmpDestOutputProfile = new HashMap<>();
-        for (int i = 0; outputIntents != null && i < outputIntents.size(); ++i)
+        if (outputIntents == null)
+        {
+            return;
+        }
+        for (int i = 0; i < outputIntents.size(); ++i)
         {
             COSDictionary outputIntentDict = (COSDictionary) 
outputIntents.getObject(i);