diff options
| author | Manuel Mall <manuel@apache.org> | 2005-12-28 04:12:40 +0000 |
|---|---|---|
| committer | Manuel Mall <manuel@apache.org> | 2005-12-28 04:12:40 +0000 |
| commit | 0249e59994ae3414287e6c897411e75c57e505c4 (patch) | |
| tree | c607e6b03ab69dd77507cf651e706d978d110d01 | |
| parent | c597c812bd0e9d7cda3ea75bde5a20f74e83a008 (diff) | |
| download | xmlgraphics-fop-0249e59994ae3414287e6c897411e75c57e505c4.tar.gz xmlgraphics-fop-0249e59994ae3414287e6c897411e75c57e505c4.zip | |
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
| -rwxr-xr-x | src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java | 4 | ||||
| -rw-r--r-- | status.xml | 3 |
2 files changed, 6 insertions, 1 deletions
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 @@ <changes> <release version="FOP Trunk"> + <action context="Code" dev="MM" type="fix" fixes-bug="38053"> + Bugfix: NullPointerException on certain fo:inline within lists. + </action> <action context="Code" dev="MM" type="fix" fixes-bug="37743"> Bugfix: ClassCastException on certain fo:inline with border combinations. </action> |