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 A601818F64 for ; Fri, 10 Jul 2015 07:34:43 +0000 (UTC) Received: (qmail 66638 invoked by uid 500); 10 Jul 2015 07:34:43 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 66614 invoked by uid 500); 10 Jul 2015 07:34:43 -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 66605 invoked by uid 99); 10 Jul 2015 07:34:43 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2015 07:34:43 +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 3B830AC0032 for ; Fri, 10 Jul 2015 07:34:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1690216 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDXObject.java Date: Fri, 10 Jul 2015 07:34:42 -0000 To: commits@pdfbox.apache.org From: jahewson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150710073443.3B830AC0032@hades.apache.org> Author: jahewson Date: Fri Jul 10 07:34:42 2015 New Revision: 1690216 URL: http://svn.apache.org/r1690216 Log: PDFBOX-2370: Avoid NPE Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDXObject.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDXObject.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDXObject.java?rev=1690216&r1=1690215&r2=1690216&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDXObject.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDXObject.java Fri Jul 10 07:34:42 2015 @@ -21,6 +21,7 @@ import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.cos.COSStream; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDResources; +import org.apache.pdfbox.pdmodel.ResourceCache; import org.apache.pdfbox.pdmodel.common.COSObjectable; import org.apache.pdfbox.pdmodel.common.PDStream; import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject; @@ -67,7 +68,8 @@ public class PDXObject implements COSObj } else if (COSName.FORM.getName().equals(subtype)) { - return new PDFormXObject(new PDStream(stream), resources.getResourceCache()); + ResourceCache cache = resources != null ? resources.getResourceCache() : null; + return new PDFormXObject(new PDStream(stream), cache); } else if (COSName.PS.getName().equals(subtype)) {