Author: jeremias
Date: Mon Oct 20 00:16:47 2008
New Revision: 706135
URL: http://svn.apache.org/viewvc?rev=706135&view=rev
Log:
Check for plan namespace to avoid errors while parsing plan XML.
Modified:
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
Modified:
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java?rev=706135&r1=706134&r2=706135&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
(original)
+++
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
Mon Oct 20 00:16:47 2008
@@ -30,6 +30,7 @@
import javax.xml.transform.stream.StreamSource;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -66,7 +67,7 @@
return info;
}
- private ImageInfo getImage(String uri, Source src, ImageContext context) {
+ private ImageInfo getImage(String uri, Source src, ImageContext context)
throws IOException {
InputStream in = new
UnclosableInputStream(ImageUtil.needInputStream(src));
try {
@@ -78,7 +79,14 @@
//Have to render the plan to know its size
PlanRenderer pr = new PlanRenderer();
- Document svgDoc = pr.createSVGDocument((Document)res.getNode());
+ Document planDoc = (Document)res.getNode();
+ Element rootEl = planDoc.getDocumentElement();
+ if
(!PlanElementMapping.NAMESPACE.equals(rootEl.getNamespaceURI())) {
+ in.reset();
+ return null;
+ }
+
+ Document svgDoc = pr.createSVGDocument(planDoc);
float width = pr.getWidth();
float height = pr.getHeight();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
