From: Chris Bowditch <cbowditch@apache.org>
Date: Mon, 25 Feb 2013 14:19:46 +0000 (+0000)
Subject: FOP-2215; NullPointerException when generating IF with fox:external-document
X-Git-Tag: fop-2_0~224
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=345150938ab9ef36b9ad7ac6d6dea00494995f43;p=xmlgraphics-fop.git

FOP-2215; NullPointerException when generating IF with fox:external-document
Submitted by Simon Steiner (ssteiner.at.thunderhead.com)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1449718 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/java/org/apache/fop/render/intermediate/IFSerializer.java b/src/java/org/apache/fop/render/intermediate/IFSerializer.java
index f8882f1e0..0a20437c0 100644
--- a/src/java/org/apache/fop/render/intermediate/IFSerializer.java
+++ b/src/java/org/apache/fop/render/intermediate/IFSerializer.java
@@ -294,7 +294,10 @@ implements IFConstants, IFPainter, IFDocumentNavigationHandler {
             AttributesImpl atts = new AttributesImpl();
             addAttribute(atts, "index", Integer.toString(index));
             addAttribute(atts, "name", name);
-            addAttribute(atts, "page-master-name", pageMasterName);
+            if (pageMasterName != null) {
+                //fox:external-document doesn't have a page-master
+                addAttribute(atts, "page-master-name", pageMasterName);
+            }
             addAttribute(atts, "width", Integer.toString(size.width));
             addAttribute(atts, "height", Integer.toString(size.height));
             addForeignAttributes(atts);
diff --git a/status.xml b/status.xml
index 773666c4c..571bf9734 100644
--- a/status.xml
+++ b/status.xml
@@ -59,6 +59,9 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Renderers" dev="CB" type="fix" fixes-bug="FOP-2215" due-to="Simon Steiner">
+       NullPointerException when generating IF with fox:external-document 
+      </action>	
       <action context="Renderers" dev="GA" type="add" fixes-bug="FOP-2206" due-to="Luis Bernardo">
        Add support for CS placement and escapement data in PS renderer.
       </action>