Author: malat
Date: 2015-11-06 19:25:53 +0000 (Fri, 06 Nov 2015)
New Revision: 18891
Added:
trunk/fop/debian/patches/bug799662.patch
Modified:
trunk/fop/debian/changelog
trunk/fop/debian/patches/series
Log:
add patch
Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog 2015-11-06 19:12:53 UTC (rev 18890)
+++ trunk/fop/debian/changelog 2015-11-06 19:25:53 UTC (rev 18891)
@@ -1,3 +1,10 @@
+fop (1:2.0+dfsg-5) UNRELEASED; urgency=medium
+
+ * allow overriding logging options. Closes: #717320
+ * Fix Null pointer exception. Closes: #799662
+
+ -- Mathieu Malaterre <ma...@debian.org> Fri, 06 Nov 2015 20:25:17 +0100
+
fop (1:2.0+dfsg-3) unstable; urgency=medium
* Upload to sid
Added: trunk/fop/debian/patches/bug799662.patch
===================================================================
--- trunk/fop/debian/patches/bug799662.patch (rev 0)
+++ trunk/fop/debian/patches/bug799662.patch 2015-11-06 19:25:53 UTC (rev
18891)
@@ -0,0 +1,20 @@
+--- src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java.orig
2015-05-26 08:03:48 UTC
++++ src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+@@ -393,7 +393,7 @@ public class ListItemLayoutManager exten
+ int breakClass = EN_AUTO;
+ KnuthElement endEl = elementLists[0].size() > 0 ? (KnuthElement)
elementLists[0].get(end[0])
+ : null;
+- Position originalLabelPosition = endEl != null ?
endEl.getPosition().getPosition() : null;
++ Position originalLabelPosition = (endEl != null &&
endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null;
+ if (endEl instanceof KnuthPenalty) {
+ additionalPenaltyHeight = endEl.getWidth();
+ stepPenalty = endEl.getPenalty() == -KnuthElement.INFINITE ?
-KnuthElement.INFINITE : Math
+@@ -402,7 +402,7 @@ public class ListItemLayoutManager exten
+ ((KnuthPenalty) endEl).getBreakClass());
+ }
+ endEl = elementLists[1].size() > 0 ? (KnuthElement)
elementLists[1].get(end[1]) : null;
+- Position originalBodyPosition = endEl != null ?
endEl.getPosition().getPosition() : null;
++ Position originalBodyPosition = (endEl != null &&
endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null;
+ if (endEl instanceof KnuthPenalty) {
+ additionalPenaltyHeight = Math.max(
+ additionalPenaltyHeight, endEl.getWidth());
Modified: trunk/fop/debian/patches/series
===================================================================
--- trunk/fop/debian/patches/series 2015-11-06 19:12:53 UTC (rev 18890)
+++ trunk/fop/debian/patches/series 2015-11-06 19:25:53 UTC (rev 18891)
@@ -1,3 +1,4 @@
04_fixqdoxbuildfailure.patch
fixbuildxml.patch
replace-sRGB-profile.patch
+bug799662.patch
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
