Author: malat-guest
Date: 2012-01-03 09:56:45 +0000 (Tue, 03 Jan 2012)
New Revision: 15631
Added:
trunk/fop/debian/patches/fixnpeinlinestacking.patch
Modified:
trunk/fop/debian/changelog
trunk/fop/debian/control
trunk/fop/debian/patches/series
Log:
Fix for a NPE.
Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog 2012-01-02 20:14:07 UTC (rev 15630)
+++ trunk/fop/debian/changelog 2012-01-03 09:56:45 UTC (rev 15631)
@@ -1,3 +1,10 @@
+fop (1:1.0.dfsg2-5) UNRELEASED; urgency=low
+
+ * Need ant 1.8.2 at least update d/control
+ * Fix NPE in inline element. Closes: #649476
+
+ -- Mathieu Malaterre <mathieu.malate...@gmail.com> Tue, 03 Jan 2012 10:52:25
+0100
+
fop (1:1.0.dfsg2-4) unstable; urgency=low
* Migrate fop to use libservlet2.5-java. Closes: #646088
Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control 2012-01-02 20:14:07 UTC (rev 15630)
+++ trunk/fop/debian/control 2012-01-03 09:56:45 UTC (rev 15631)
@@ -8,7 +8,7 @@
Mathieu Malaterre <mathieu.malate...@gmail.com>,
Vincent Fourmond <fourm...@debian.org>
Build-Depends: debhelper (>= 5), cdbs (>= 0.4.27)
-Build-Depends-Indep: ant-optional, libbatik-java (>= 1.7),
+Build-Depends-Indep: ant-optional (>= 1.8.2), libbatik-java (>= 1.7),
libavalon-framework-java (>=4.1.2-2), libxalan2-java,
libxerces2-java, default-jdk, libcommons-io-java, libxmlunit-java,
libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.4),
Added: trunk/fop/debian/patches/fixnpeinlinestacking.patch
===================================================================
--- trunk/fop/debian/patches/fixnpeinlinestacking.patch
(rev 0)
+++ trunk/fop/debian/patches/fixnpeinlinestacking.patch 2012-01-03 09:56:45 UTC
(rev 15631)
@@ -0,0 +1,20 @@
+Description: Avoid an NPE in InlineStackingLM.applyChanges for Knuth elements
with a null position
+Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=50276
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649476
+Origin: http://svn.apache.org/viewvc?view=revision&revision=1043871
+Index:
src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
+===================================================================
+---
fop/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
(revision 1042934)
++++
fop/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
(revision 1043871)
+@@ -285,8 +285,9 @@
+ KnuthElement oldElement;
+ while (oldListIterator.hasNext()) {
+ oldElement = (KnuthElement) oldListIterator.next();
+- oldElement.setPosition
+- (oldElement.getPosition().getPosition());
++ if (oldElement.getPosition() != null) {
++
oldElement.setPosition(oldElement.getPosition().getPosition());
++ }
+ }
+ // reset the iterator
+ oldListIterator = oldList.listIterator();
Modified: trunk/fop/debian/patches/series
===================================================================
--- trunk/fop/debian/patches/series 2012-01-02 20:14:07 UTC (rev 15630)
+++ trunk/fop/debian/patches/series 2012-01-03 09:56:45 UTC (rev 15631)
@@ -2,3 +2,4 @@
enco.patch
enco2.patch
fixbuildxml.patch
+fixnpeinlinestacking.patch
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
