From c597c812bd0e9d7cda3ea75bde5a20f74e83a008 Mon Sep 17 00:00:00 2001
From: Manuel Mall <manuel@apache.org>
Date: Wed, 28 Dec 2005 03:21:08 +0000
Subject: [PATCH] Fix for bug 37743 and part of 38053

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@359368 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/fop/layoutmgr/inline/LineLayoutManager.java    | 2 +-
 status.xml                                                | 8 ++++++++
 test/layoutengine/disabled-testcases.xml                  | 7 -------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
index 454cb093b..b14293d89 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
@@ -1777,7 +1777,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
                     && (!context.isLastArea() || parentIter.hasNext())) {
                     lineArea.setBPD(lineArea.getBPD() + context.getSpaceAfter());
                 }
-                lineArea.finalize();
+                lineArea.finalise();
                 parentLM.addChildArea(lineArea);
             } else if (pos instanceof NonLeafPosition) {
                 // Nested block-level content;
diff --git a/status.xml b/status.xml
index 525e0e1fe..440e785bd 100644
--- a/status.xml
+++ b/status.xml
@@ -27,6 +27,14 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="MM" type="fix" fixes-bug="37743">
+        Bugfix: ClassCastException on certain fo:inline with border combinations.
+      </action>
+      <action context="Code" dev="MM" type="fix">
+        Changed a method name in LineArea from finalize to finalise because it was
+        never intended for the method to be an override of the Java Object finalize
+        method. If invoked by the Java garbage collector it may cause a NPE.
+      </action>
     </release>
     <release version="0.91beta" date="23 Dec 2005">
       <action context="Code" dev="JM" type="update">
diff --git a/test/layoutengine/disabled-testcases.xml b/test/layoutengine/disabled-testcases.xml
index 43c347998..2663134d4 100755
--- a/test/layoutengine/disabled-testcases.xml
+++ b/test/layoutengine/disabled-testcases.xml
@@ -141,13 +141,6 @@
     <description>Placing a table as a child of an fo:inline produces a 
     NullPointerException.</description>
   </testcase>
-  <testcase>
-    <name>ClassCastException caused by inline border</name>
-    <file>inline_border_bug37743.xml</file>
-    <description>A ClassCastException occurs during element list creation when an 
-    inline with a border is directly followed by character data.</description>
-    <reference>http://issues.apache.org/bugzilla/show_bug.cgi?id=37743</reference>
-  </testcase>
   <testcase>
     <name>inline-container is not implemented, yet.</name>
     <file>inline-container_block_nested.xml</file>
-- 
2.39.5