Author: tilman
Date: Mon Mar 9 10:49:03 2026
New Revision: 1932228
Log:
PDFBOX-6173: avoid NPE, as suggested by Julian Stenzel
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
Mon Mar 9 08:30:16 2026 (r1932227)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
Mon Mar 9 10:49:03 2026 (r1932228)
@@ -1357,7 +1357,7 @@ public class PDFMergerUtility
boolean skip = false;
for (PDOutputIntent dstOI : dstOutputIntents)
{
- if (dstOI.getOutputConditionIdentifier().equals(srcOCI))
+ if (srcOCI.equals(dstOI.getOutputConditionIdentifier()))
{
skip = true;
break;