jycli 2004/02/05 12:35:39
Modified: java/src/org/apache/xalan/processor
ProcessorExsltFunction.java
Log:
Fix for bugzilla bug report 18351.
xsl:message instruction is allowed inside func:function.
It doesn't construct nodes as part of the result.
Reviewed by Henry Zongaro ([EMAIL PROTECTED])
Revision Changes Path
1.8 +5 -3
xml-xalan/java/src/org/apache/xalan/processor/ProcessorExsltFunction.java
Index: ProcessorExsltFunction.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorExsltFunction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProcessorExsltFunction.java 17 Oct 2003 20:59:30 -0000 1.7
+++ ProcessorExsltFunction.java 5 Feb 2004 20:35:39 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,6 +79,7 @@
import org.apache.xalan.templates.ElemTextLiteral;
import org.apache.xalan.templates.ElemValueOf;
import org.apache.xalan.templates.ElemVariable;
+import org.apache.xalan.templates.ElemMessage;
import org.apache.xalan.templates.Stylesheet;
import org.xml.sax.Attributes;
@@ -216,11 +217,12 @@
ElemTemplateElement parent = child.getParentElem();
if (parent instanceof ElemExsltFuncResult
|| parent instanceof ElemVariable
- || parent instanceof ElemParam)
+ || parent instanceof ElemParam
+ || parent instanceof ElemMessage)
return true;
child = parent;
}
return false;
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
