From 7f020cc606a2c6260f0f42ab4e1b0ce2e18b8159 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Thu, 18 May 2006 18:58:05 +0000 Subject: Bugfix: NullPointerException in AreaAdditionUtil in a table-cell spanning multiple pages and with a marker. Note: This is a hack to avoid the NPE. A problem remains. The markers will not be added if the first/last conditions cannot be determined. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@407614 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/java') diff --git a/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java b/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java index a210754af..866b8236d 100644 --- a/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java +++ b/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java @@ -85,6 +85,13 @@ public class AreaAdditionUtil { // pos was created by this LM, so it must be ignored } } + if (firstPos == null) { + return; //Nothing to do, return early + //TODO This is a hack to avoid an NPE in the code block below. + //If there's no firstPos/lastPos there's currently no way to + //correctly determine first and last conditions. The Iterator + //doesn't give us that info. + } if (bslm != null && bslm.markers != null) { bslm.getCurrentPV().addMarkers(bslm.markers, true, -- cgit v1.2.3