Author: ningjiang
Date: Tue Feb 7 15:38:40 2012
New Revision: 1241489
URL: http://svn.apache.org/viewvc?rev=1241489&view=rev
Log:
Merged revisions 1241482 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1241482 | ningjiang | 2012-02-07 23:09:41 +0800 (Tue, 07 Feb 2012) | 1 line
CAMEL-4989 BindyDataFormat should not use the default encoding
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 7 15:38:40 2012
@@ -1 +1 @@
-/camel/trunk:1235643,1236639,1236667,1237666,1237807,1238225,1238229,1238387,1238463,1238477,1238503,1238937,1238988,1239006,1239045,1239080-1239081,1239470,1239479,1239497,1240025,1240063,1240950
+/camel/trunk:1235643,1236639,1236667,1237666,1237807,1238225,1238229,1238387,1238463,1238477,1238503,1238937,1238988,1239006,1239045,1239080-1239081,1239470,1239479,1239497,1240025,1240063,1240950,1241482
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java?rev=1241489&r1=1241488&r2=1241489&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
Tue Feb 7 15:38:40 2012
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Scanner;
import org.apache.camel.Exchange;
+import org.apache.camel.converter.IOConverter;
import org.apache.camel.dataformat.bindy.BindyAbstractDataFormat;
import org.apache.camel.dataformat.bindy.BindyAbstractFactory;
import org.apache.camel.dataformat.bindy.BindyCsvFactory;
@@ -112,7 +113,7 @@ public class BindyCsvDataFormat extends
// Pojos of the model
Map<String, Object> model;
- InputStreamReader in = new InputStreamReader(inputStream);
+ InputStreamReader in = new InputStreamReader(inputStream,
IOHelper.getCharsetName(exchange));
// Scanner is used to read big file
Scanner scanner = new Scanner(in);
Modified:
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java?rev=1241489&r1=1241488&r2=1241489&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
Tue Feb 7 15:38:40 2012
@@ -102,7 +102,7 @@ public class BindyFixedLengthDataFormat
// Pojos of the model
Map<String, Object> model;
- InputStreamReader in = new InputStreamReader(inputStream);
+ InputStreamReader in = new InputStreamReader(inputStream,
IOHelper.getCharsetName(exchange));
// Scanner is used to read big file
Scanner scanner = new Scanner(in);
Modified:
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java?rev=1241489&r1=1241488&r2=1241489&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
Tue Feb 7 15:38:40 2012
@@ -84,7 +84,7 @@ public class BindyKeyValuePairDataFormat
// Map to hold the model @OneToMany classes while binding
Map<String, List<Object>> lists = new HashMap<String, List<Object>>();
- InputStreamReader in = new InputStreamReader(inputStream);
+ InputStreamReader in = new InputStreamReader(inputStream,
IOHelper.getCharsetName(exchange));
// Scanner is used to read big file
Scanner scanner = new Scanner(in);
