Author: jeremias
Date: Wed Oct  7 13:53:33 2009
New Revision: 822742

URL: http://svn.apache.org/viewvc?rev=822742&view=rev
Log:
Bugzilla #47953:
Bugfix for NPE: referencedFontsMatcher can also be null, not just localMatcher.

Modified:
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java?rev=822742&r1=822741&r2=822742&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
 Wed Oct  7 13:53:33 2009
@@ -266,7 +266,7 @@
                                   + triplet.getWeight());
                     }
 
-                    if (referencedFontsMatcher.matches(triplet)
+                    if ((referencedFontsMatcher != null && 
referencedFontsMatcher.matches(triplet))
                             || (localMatcher != null && 
localMatcher.matches(triplet))) {
                         afi.getAFPFont().setEmbeddable(false);
                         break;



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to