From f59abd860a61c94ee6f0d31178b92ef7ea1bff32 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Wed, 7 Oct 2009 13:53:33 +0000 Subject: Bugzilla #47953: Bugfix for NPE: referencedFontsMatcher can also be null, not just localMatcher. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@822742 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java b/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java index 071357b82..49e51b3d1 100644 --- a/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java +++ b/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java @@ -266,7 +266,7 @@ public class AFPRendererConfigurator extends PrintRendererConfigurator + triplet.getWeight()); } - if (referencedFontsMatcher.matches(triplet) + if ((referencedFontsMatcher != null && referencedFontsMatcher.matches(triplet)) || (localMatcher != null && localMatcher.matches(triplet))) { afi.getAFPFont().setEmbeddable(false); break; -- cgit v1.2.3