You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/10/20 13:42:25 UTC
svn commit: r326894 - in /cocoon/branches/BRANCH_2_1_X:
src/java/org/apache/cocoon/xml/IncludeXMLConsumer.java status.xml
Author: cziegeler
Date: Thu Oct 20 04:42:20 2005
New Revision: 326894
URL: http://svn.apache.org/viewcvs?rev=326894&view=rev
Log:
Fix bug with session:getxml when path is a text-element and IncludeXMLConsumer
when including text nodes.
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/IncludeXMLConsumer.java
cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/IncludeXMLConsumer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/IncludeXMLConsumer.java?rev=326894&r1=326893&r2=326894&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/IncludeXMLConsumer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/IncludeXMLConsumer.java Thu Oct 20 04:42:20 2005
@@ -98,17 +98,22 @@
LexicalHandler lexicalHandler)
throws SAXException {
if (node != null) {
- try {
- IncludeXMLConsumer filter = new IncludeXMLConsumer(contentHandler, lexicalHandler);
- Transformer transformer = FACTORY.newTransformer();
- DOMSource source = new DOMSource(node);
- SAXResult result = new SAXResult(filter);
- result.setLexicalHandler(filter);
- transformer.transform(source, result);
- } catch (TransformerConfigurationException e) {
- throw new SAXException("TransformerConfigurationException", e);
- } catch (TransformerException e) {
- throw new SAXException("TransformerException", e);
+ if (node.getNodeType() == Node.TEXT_NODE){
+ String value = node.getNodeValue();
+ contentHandler.characters(value.toCharArray(), 0, value.length());
+ } else {
+ try {
+ IncludeXMLConsumer filter = new IncludeXMLConsumer(contentHandler, lexicalHandler);
+ Transformer transformer = FACTORY.newTransformer();
+ DOMSource source = new DOMSource(node);
+ SAXResult result = new SAXResult(filter);
+ result.setLexicalHandler(filter);
+ transformer.transform(source, result);
+ } catch (TransformerConfigurationException e) {
+ throw new SAXException("TransformerConfigurationException", e);
+ } catch (TransformerException e) {
+ throw new SAXException("TransformerException", e);
+ }
}
}
}
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=326894&r1=326893&r2=326894&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Oct 20 04:42:20 2005
@@ -175,6 +175,10 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="fix" fixes-bug="36471" due-to="Armaz Mellati" due-to-email="armaz@uninett.no">
+ Fix bug with session:getxml when path is a text-element and IncludeXMLConsumer
+ when including text nodes.
+ </action>
<action dev="CZ" type="update">
Update Pluto to final release 1.0.1.
</action>