camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [1/2] git commit: CAMEL-7025 revert the change of StaxConverterTest which should not be committed yet
Date Mon, 02 Dec 2013 07:12:28 GMT
Updated Branches:
  refs/heads/camel-2.11.x 958157b8b -> 7fa3bb401
  refs/heads/camel-2.12.x 78f3531d3 -> 5c85b0dcb


CAMEL-7025 revert the change of StaxConverterTest which should not be committed yet


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5c85b0dc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5c85b0dc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5c85b0dc

Branch: refs/heads/camel-2.12.x
Commit: 5c85b0dcbf45ea845f0617cd8c863aed47cb2b0f
Parents: 78f3531
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Mon Dec 2 14:54:35 2013 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Mon Dec 2 15:11:14 2013 +0800

----------------------------------------------------------------------
 .../java/org/apache/camel/converter/jaxp/StaxConverterTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/5c85b0dc/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
index 3caba1f..1049332 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
@@ -58,7 +58,7 @@ public class StaxConverterTest extends ContextTestSupport {
             output = new ByteArrayOutputStream();
             // ensure UTF-8 encoding
             Exchange exchange = new DefaultExchange(context);
-            //exchange.setProperty(Exchange.CHARSET_NAME, ISO_8859_1.toString());
+            exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.toString());
             writer = context.getTypeConverter().mandatoryConvertTo(XMLEventWriter.class,
exchange, output);
             while (reader.hasNext()) {
                 writer.add(reader.nextEvent());
@@ -92,7 +92,7 @@ public class StaxConverterTest extends ContextTestSupport {
             output = new ByteArrayOutputStream();
             // ensure UTF-8 encoding
             Exchange exchange = new DefaultExchange(context);
-            //exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.name());
+            exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.name());
             writer = context.getTypeConverter().mandatoryConvertTo(XMLStreamWriter.class,
exchange, output);
             // copy to writer
             while (reader.hasNext()) {


Mime
View raw message