cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lgaw...@apache.org
Subject svn commit: r703661 - in /cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src: changes/changes.xml main/java/org/apache/cocoon/template/instruction/Out.java
Date Sat, 11 Oct 2008 13:57:23 GMT
Author: lgawron
Date: Sat Oct 11 06:57:22 2008
New Revision: 703661

URL: http://svn.apache.org/viewvc?rev=703661&view=rev
Log:
<jx:out xmlize="true"/> problem: val.toString().getBytes() effected in xml parsing errors
(uses default platform encoding while parser expects utf-8).

Modified:
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Out.java

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/changes/changes.xml?rev=703661&r1=703660&r2=703661&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/changes/changes.xml Sat Oct
11 06:57:22 2008
@@ -25,6 +25,11 @@
 <document>
   <body>
     <release version="1.2.0" date="2008-??-??" description="unreleased">
+      <action dev="lgawron" type="fix">
+        &lt;jx:out xmlize=&quot;true&quot;/&gt; problem: val.toString().getBytes()
effected in xml parsing errors
+        (uses default platform encoding while parser expects utf-8).
+        Introduction of &lt;jx:out xmlize=&quot;true&quot; encoding=&quot;...&quot;/&gt;
should be considered.
+      </action>
       <action dev="gkossakowski" type="add" issue="COCOON-2211" due-to="Kamal Bhatt" due-to-email="bhatt@tt.com.au">
         Add support for jx:element - the instructions that allow dynamic element creation.
       </action>

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Out.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Out.java?rev=703661&r1=703660&r2=703661&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Out.java
(original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/Out.java
Sat Oct 11 06:57:22 2008
@@ -85,7 +85,7 @@
                     Invoker.executeNode(consumer, val, stripRoot);
                 else {
                     SAXParser parser = executionContext.getSaxParser();
-                    InputSource source = new InputSource(new ByteArrayInputStream(val.toString().getBytes()));
+                    InputSource source = new InputSource(new ByteArrayInputStream(val.toString().getBytes("utf-8")));
                     IncludeXMLConsumer includeConsumer = new IncludeXMLConsumer(consumer);
                     includeConsumer.setIgnoreRootElement(stripRoot);
                     parser.parse(source, includeConsumer);



Mime
View raw message