From commits-return-14791-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Sat Jun 15 14:34:20 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 3EB3318064D for ; Sat, 15 Jun 2019 16:34:20 +0200 (CEST) Received: (qmail 9995 invoked by uid 500); 15 Jun 2019 14:34:19 -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 9986 invoked by uid 99); 15 Jun 2019 14:34:19 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Jun 2019 14:34:19 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 002583A0069 for ; Sat, 15 Jun 2019 14:34:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1861397 - in /pdfbox/trunk: pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java Date: Sat, 15 Jun 2019 14:34:18 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190615143419.002583A0069@svn01-us-west.apache.org> Author: tilman Date: Sat Jun 15 14:34:18 2019 New Revision: 1861397 URL: http://svn.apache.org/viewvc?rev=1861397&view=rev Log: PDFBOX-4071: SonarQube fix Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java?rev=1861397&r1=1861396&r2=1861397&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java Sat Jun 15 14:34:18 2019 @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFac import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.io.ScratchFile; import org.apache.pdfbox.pdfparser.PDFObjectStreamParser; -import org.apache.pdfbox.pdmodel.PDDocument; /** * This is the in-memory representation of the PDF document. You need to call Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java?rev=1861397&r1=1861396&r2=1861397&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java (original) +++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java Sat Jun 15 14:34:18 2019 @@ -70,7 +70,7 @@ public class BookmarkValidationProcess e addValidationError(ctx, new ValidationError(ERROR_SYNTAX_TRAILER_OUTLINES_INVALID, "Outline Hierarchy doesn't have Count entry")); } - else if (isCountEntryPositive(ctx, dict) + else if (isCountEntryPositive(dict) && (outlineHierarchy.getFirstChild() == null || outlineHierarchy.getLastChild() == null)) { addValidationError(ctx, new ValidationError(ERROR_SYNTAX_TRAILER_OUTLINES_INVALID, @@ -106,7 +106,7 @@ public class BookmarkValidationProcess e * @param outline the dictionary representing the document outline. * @return true if the Count entry > 0. */ - private boolean isCountEntryPositive(PreflightContext ctx, COSDictionary outline) + private boolean isCountEntryPositive(COSDictionary outline) { COSBase countBase = outline.getDictionaryObject(COSName.COUNT); return countBase instanceof COSInteger && ((COSInteger) countBase).intValue() > 0;