From 0249e59994ae3414287e6c897411e75c57e505c4 Mon Sep 17 00:00:00 2001 From: Manuel Mall Date: Wed, 28 Dec 2005 04:12:40 +0000 Subject: [PATCH] Fix for NPE reported in bugzilla 38053. Unfortunately I have not been able to construct a small testcase for it. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@359383 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/fop/layoutmgr/inline/InlineLayoutManager.java | 4 +++- status.xml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java index 5650c3e80..633dda77d 100755 --- a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java @@ -423,7 +423,9 @@ public class InlineLayoutManager extends InlineStackingLayoutManager { context.getTrailingSpace().addSpace(new SpaceVal(getSpaceEnd(), this)); } - setTraits(areaCreated, !isLast(lastPos)); + // Not sure if lastPos can legally be null or if that masks a different problem. + // But it seems to fix bug 38053. + setTraits(areaCreated, lastPos == null || !isLast(lastPos)); parentLM.addChildArea(getCurrentArea()); context.setFlags(LayoutContext.LAST_AREA, isLast); diff --git a/status.xml b/status.xml index 440e785bd..e571ed84d 100644 --- a/status.xml +++ b/status.xml @@ -27,6 +27,9 @@ + + Bugfix: NullPointerException on certain fo:inline within lists. + Bugfix: ClassCastException on certain fo:inline with border combinations. -- 2.39.5