Author: tilman
Date: Sun Jun 7 19:15:14 2026
New Revision: 1935131
Log:
PDFBOX-5660: Sonar fix
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Sun Jun 7 19:15:11 2026 (r1935130)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Sun Jun 7 19:15:14 2026 (r1935131)
@@ -1087,22 +1087,19 @@ class PDFMergerUtilityTest
}
}
}
- 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)
- {
- assertNotEquals(-1, pageTree.indexOf(page),
- "Annotation page is not in the page
tree: " + item);
- }
- else
- {
- // don't display because of stack overflow
- assertNotEquals(-1, pageTree.indexOf(page),
- "Annotation page is not in the page
tree");
- }
+ assertNotEquals(-1, pageTree.indexOf(page),
+ "Annotation page is not in the page tree:
" + item);
+ }
+ else
+ {
+ // don't display because of stack overflow
+ assertNotEquals(-1, pageTree.indexOf(page),
+ "Annotation page is not in the page tree");
}
}
}