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

THausherr · THausherr · commit 5b3019d78e0c · 2026-03-09T10:49:03.000Z
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1932228 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java b/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
@@ -1357,7 +1357,7 @@ private void mergeOutputIntents(PDDocumentCatalog srcCatalog, PDDocumentCatalog
                 boolean skip = false;
                 for (PDOutputIntent dstOI : dstOutputIntents)
                 {
-                    if (dstOI.getOutputConditionIdentifier().equals(srcOCI))
+                    if (srcOCI.equals(dstOI.getOutputConditionIdentifier()))
                     {
                         skip = true;
                         break;

Original file line number	Diff line number	Diff line change
`@@ -1357,7 +1357,7 @@ private void mergeOutputIntents(PDDocumentCatalog srcCatalog, PDDocumentCatalog`
`1357`	`1357`	`boolean skip = false;`
`1358`	`1358`	`for (PDOutputIntent dstOI : dstOutputIntents)`
`1359`	`1359`	`{`
`1360`		`- if (dstOI.getOutputConditionIdentifier().equals(srcOCI))`
	`1360`	`+ if (srcOCI.equals(dstOI.getOutputConditionIdentifier()))`
`1361`	`1361`	`{`
`1362`	`1362`	`skip = true;`
`1363`	`1363`	`break;`