Author: tilman
Date: Sun Jun 7 19:15:11 2026
New Revision: 1935130
Log:
PDFBOX-5660: Sonar fix
Modified:
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Modified:
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Sun Jun 7 19:15:08 2026 (r1935129)
+++
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Sun Jun 7 19:15:11 2026 (r1935130)
@@ -1060,20 +1060,17 @@ public class PDFMergerUtilityTest extend
}
}
}
- if (page != null)
+ if (page != null && pageTree.indexOf(page) == -1)
{
- if (pageTree.indexOf(page) == -1)
+ COSBase item = kdict.getItem(COSName.OBJ);
+ if (item instanceof COSObject)
{
- COSBase item = kdict.getItem(COSName.OBJ);
- if (item instanceof COSObject)
- {
- Assert.assertNotEquals("Annotation page is not
in the page tree: " + item, -1, pageTree.indexOf(page));
- }
- else
- {
- // don't display because of stack overflow
- Assert.assertNotEquals("Annotation page is not
in the page tree", -1, pageTree.indexOf(page));
- }
+ Assert.assertNotEquals("Annotation page is not in
the page tree: " + item, -1, pageTree.indexOf(page));
+ }
+ else
+ {
+ // don't display because of stack overflow
+ Assert.assertNotEquals("Annotation page is not in
the page tree", -1, pageTree.indexOf(page));
}
}
}