morten 01/07/19 09:46:35
Modified: java/src/org/apache/xalan/xsltc/runtime
AbstractTranslet.java TextOutput.java
Log:
A few fixes to my last fix (ie. cleaning up). The last fix caused a
null-pointer exception in the output post-processor and had an ugly
debug print-statement in the AbstractTranslet base-class.
PR: n/a
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.14 +2 -5
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/AbstractTranslet.java
Index: AbstractTranslet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/AbstractTranslet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractTranslet.java 2001/07/19 13:16:17 1.13
+++ AbstractTranslet.java 2001/07/19 16:46:35 1.14
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: AbstractTranslet.java,v 1.13 2001/07/19 13:16:17 morten Exp $
+ * @(#)$Id: AbstractTranslet.java,v 1.14 2001/07/19 16:46:35 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -526,10 +526,7 @@
// It is an error if this method is called with anything else than
// the translet post-processor (TextOutput)
- if (!(output instanceof TextOutput)) {
- System.err.println("output is "+output);
- return;
- }
+ if (!(output instanceof TextOutput)) return;
TextOutput handler = (TextOutput)output;
1.14 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TextOutput.java
Index: TextOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TextOutput.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TextOutput.java 2001/07/19 09:19:50 1.13
+++ TextOutput.java 2001/07/19 16:46:35 1.14
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TextOutput.java,v 1.13 2001/07/19 09:19:50 morten Exp $
+ * @(#)$Id: TextOutput.java,v 1.14 2001/07/19 16:46:35 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -453,7 +453,7 @@
_qnameStack.push(elementName);
- if (_cdata.get(elementName) != null)
+ if ((_cdata != null) && (_cdata.get(elementName) != null))
_cdataStack.push(new Integer(_depth));
// Insert <META> tag directly after <HEAD> element in HTML doc
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
