You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ad...@apache.org on 2008/06/26 21:44:20 UTC
svn commit: r672010 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
Author: adelmelle
Date: Thu Jun 26 12:44:20 2008
New Revision: 672010
URL: http://svn.apache.org/viewvc?rev=672010&view=rev
Log:
Fixed a possible NullPointerException: if the citation appears in a fo:marker, the property will only be parsed if the marker is retrieved...
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java?rev=672010&r1=672009&r2=672010&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java Thu Jun 26 12:44:20 2008
@@ -22,6 +22,7 @@
import java.awt.Color;
import org.xml.sax.Locator;
+import org.xml.sax.Attributes;
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Length;
@@ -104,13 +105,18 @@
}
/** {@inheritDoc} */
- protected void startOfNode() throws FOPException {
- super.startOfNode();
- if (refId.equals("")) {
+ public void processNode(String elementName, Locator locator, Attributes attlist, PropertyList pList) throws FOPException {
+ super.processNode(elementName, locator, attlist, pList);
+ if (!inMarker() && (refId == null || "".equals(refId))) {
missingPropertyError("ref-id");
}
}
+ /** {@inheritDoc} */
+ protected void startOfNode() throws FOPException {
+ super.startOfNode();
+ }
+
/**
* {@inheritDoc}
* <br>XSL Content Model: empty
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org