Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6546817FCB for ; Sat, 14 Mar 2015 15:53:49 +0000 (UTC) Received: (qmail 56385 invoked by uid 500); 14 Mar 2015 15:53:49 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 56356 invoked by uid 500); 14 Mar 2015 15:53:49 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 56346 invoked by uid 99); 14 Mar 2015 15:53:49 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Mar 2015 15:53:49 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id E22ABAC0163 for ; Sat, 14 Mar 2015 15:53:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1666698 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java Date: Sat, 14 Mar 2015 15:53:48 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150314155348.E22ABAC0163@hades.apache.org> Author: tilman Date: Sat Mar 14 15:53:48 2015 New Revision: 1666698 URL: http://svn.apache.org/r1666698 Log: PDFBOX-2708, PDFBOX-2423: use removeObject() instead of remove() to delete a page from the tree, update count only when successful, by Radomir Mladenovic Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java?rev=1666698&r1=1666697&r2=1666698&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java Sat Mar 14 15:53:48 2015 @@ -346,18 +346,19 @@ public class PDPageTree implements COSOb // remove from parent's kids COSDictionary parent = (COSDictionary) node.getDictionaryObject(COSName.PARENT, COSName.P); COSArray kids = (COSArray)parent.getDictionaryObject(COSName.KIDS); - kids.remove(node); - - // update ancestor counts - do + if (kids.removeObject(node)) { - node = (COSDictionary) node.getDictionaryObject(COSName.PARENT, COSName.P); - if (node != null) + // update ancestor counts + do { - node.setInt(COSName.COUNT, node.getInt(COSName.COUNT) - 1); + node = (COSDictionary) node.getDictionaryObject(COSName.PARENT, COSName.P); + if (node != null) + { + node.setInt(COSName.COUNT, node.getInt(COSName.COUNT) - 1); + } } + while (node != null); } - while (node != null); } /**