svn commit: r1932229 - pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf

[tilman]

Author: tilman
Date: Mon Mar  9 10:49:07 2026
New Revision: 1932229

Log:
PDFBOX-6173: avoid NPE, as suggested by Julian Stenzel

Modified:
   
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java

Modified: 
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
==============================================================================
--- 
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
   Mon Mar  9 10:49:03 2026        (r1932228)
+++ 
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
   Mon Mar  9 10:49:07 2026        (r1932229)
@@ -1356,7 +1356,7 @@ public class PDFMergerUtility
                 boolean skip = false;
                 for (PDOutputIntent dstOI : dstOutputIntents)
                 {
-                    if (dstOI.getOutputConditionIdentifier().equals(srcOCI))
+                    if (srcOCI.equals(dstOI.getOutputConditionIdentifier()))
                     {
                         skip = true;
                         break;