aboutsummaryrefslogtreecommitdiffstats
path: root/src/java
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2005-07-26 07:41:58 +0000
committerJeremias Maerki <jeremias@apache.org>2005-07-26 07:41:58 +0000
commitb5d1038d5ea31add5ba276f5379fa95fdc345c5d (patch)
tree9b5ab88a2ec8e9d9908cb42f3d68efb9e188fe0e /src/java
parent89060b99d9e8f32d165a34c05f6cd8ca840b97b2 (diff)
downloadxmlgraphics-fop-b5d1038d5ea31add5ba276f5379fa95fdc345c5d.tar.gz
xmlgraphics-fop-b5d1038d5ea31add5ba276f5379fa95fdc345c5d.zip
Bugfix for NPE when space-before and space-after are used.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@225249 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java')
-rw-r--r--src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
index 31f067261..78b1e40e9 100644
--- a/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
@@ -146,7 +146,8 @@ public class ListBlockLayoutManager extends BlockStackingLayoutManager {
lastPos = pos;
}
if (pos instanceof NonLeafPosition
- && ((NonLeafPosition) pos).getPosition().getLM() != this) {
+ && (pos.getPosition() != null)
+ && ((NonLeafPosition) pos).getPosition().getLM() != this) {
// pos was created by a child of this ListBlockLM
positionList.add(((NonLeafPosition) pos).getPosition());
lastLM = ((NonLeafPosition) pos).getPosition().getLM();