From ffc6c6da3f8334083ba3b03e339cf581b7f6babf Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Tue, 27 Jun 2006 18:16:31 +0000 Subject: [PATCH] Fix NPE in case there are no extension attachments and the area tree was built from the intermediate format. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@417542 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/area/PageViewport.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/java/org/apache/fop/area/PageViewport.java b/src/java/org/apache/fop/area/PageViewport.java index e2986855a..e4be2d8e2 100644 --- a/src/java/org/apache/fop/area/PageViewport.java +++ b/src/java/org/apache/fop/area/PageViewport.java @@ -23,6 +23,7 @@ import java.awt.geom.Rectangle2D; import java.io.ObjectOutputStream; import java.io.ObjectInputStream; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.HashMap; @@ -563,7 +564,11 @@ public class PageViewport extends AreaTreeObject implements Resolvable, Cloneabl /** @return the list of extension attachments for this page */ public List getExtensionAttachments() { - return this.extensionAttachments; + if (this.extensionAttachments == null) { + return Collections.EMPTY_LIST; + } else { + return this.extensionAttachments; + } } /** @return True if this is a blank page. */ -- 2.39.5