Fix for NPE reported in bugzilla 38053. Unfortunately I have not been able to constru...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@359383 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
index 5650c3e8028e7430e95f72d9b159c269ad49ce2e..633dda77deb6c208b069dc051a2bb15d74b914f7 100755 (executable)
--- 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 440e785bd919ba1d4b6c4eb3a68774678db53d6a..e571ed84d5de99abb64353118013f379af51c6dc 100644 (file)
--- 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>