You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2018/12/20 21:12:29 UTC
svn commit: r1849438 - in /pdfbox/branches/2.0/pdfbox/src:
main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Author: tilman
Date: Thu Dec 20 21:12:29 2018
New Revision: 1849438
URL: http://svn.apache.org/viewvc?rev=1849438&view=rev
Log:
PDFBOX-4407: don't clone a clone; activate test fully and improve message
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1849438&r1=1849437&r2=1849438&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java Thu Dec 20 21:12:29 2018
@@ -964,6 +964,11 @@ public class PDFMergerUtility
{
parentTreeEntry.setItem(COSName.OBJ, objMapping.get(obj));
}
+ else if (objMapping.containsValue(obj))
+ {
+ // PDFBOX-4407: don't clone a clone
+ LOG.debug("don't clone a clone");
+ }
else
{
// PDFBOX-3999: clone objects that are not in mapping to make sure that
Modified: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java?rev=1849438&r1=1849437&r2=1849438&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java Thu Dec 20 21:12:29 2018
@@ -425,11 +425,18 @@ public class PDFMergerUtilityTest extend
PDPage page = annotation.getPage();
if (page != null)
{
- //TODO activate when PDFBOX-4407 is solved
- //assertTrue("Annotation page is not in the page tree", pageTree.indexOf(page) != -1);
if (pageTree.indexOf(page) == -1)
{
- System.err.println("Annotation page is not in the page tree");
+ COSBase item = kdict.getItem(COSName.OBJ);
+ if (item instanceof COSObject)
+ {
+ assertTrue("Annotation page is not in the page tree: " + item, pageTree.indexOf(page) != -1);
+ }
+ else
+ {
+ // don't display because of stack overflow
+ assertTrue("Annotation page is not in the page tree", pageTree.indexOf(page) != -1);
+ }
}
}
}