dims 00/11/01 12:19:09
Modified: src/org/apache/cocoon/transformation Tag: xml-cocoon2
XIncludeTransformer.java
Log:
Check for null's. Fixes problem reported by Lassi Immonen.
Revision Changes Path
No revision
No revision
1.1.2.10 +3 -3
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- XIncludeTransformer.java 2000/10/19 14:44:35 1.1.2.9
+++ XIncludeTransformer.java 2000/11/01 20:19:05 1.1.2.10
@@ -43,7 +43,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/10/19 14:44:35 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/11/01 20:19:05 $ $Author:
dims $
*/
public class XIncludeTransformer extends AbstractTransformer implements
Composer {
@@ -104,7 +104,7 @@
throw new SAXException(e);
}
}
- if (uri.equals(XINCLUDE_NAMESPACE_URI) &&
name.equals(XINCLUDE_INCLUDE_ELEMENT)) {
+ if (uri != null && name != null &&
uri.equals(XINCLUDE_NAMESPACE_URI) && name.equals(XINCLUDE_INCLUDE_ELEMENT)) {
String href =
attr.getValue("",XINCLUDE_INCLUDE_ELEMENT_HREF_ATTRIBUTE);
String parse =
attr.getValue("",XINCLUDE_INCLUDE_ELEMENT_PARSE_ATTRIBUTE);
try {
@@ -123,7 +123,7 @@
if (last_xmlbase_element_uri.equals(uri) &&
last_xmlbase_element_name.equals(name)) {
endXMLBaseAttribute();
}
- if (uri.equals(XINCLUDE_NAMESPACE_URI) &&
name.equals(XINCLUDE_INCLUDE_ELEMENT)) {
+ if (uri != null && name != null &&
uri.equals(XINCLUDE_NAMESPACE_URI) && name.equals(XINCLUDE_INCLUDE_ELEMENT)) {
return;
}
super.endElement(uri,name,raw);
