aboutsummaryrefslogtreecommitdiffstats
path: root/src/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/java')
-rw-r--r--src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java7
1 files changed, 7 insertions, 0 deletions
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,