You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/02/07 16:45:42 UTC
svn commit: r1241494 - in /camel/branches/camel-2.8.x: ./
components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/
components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/
components/camel-bindy/src/main/java/org...
Author: ningjiang
Date: Tue Feb 7 15:45:42 2012
New Revision: 1241494
URL: http://svn.apache.org/viewvc?rev=1241494&view=rev
Log:
Merged revisions 1241489 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
................
r1241489 | ningjiang | 2012-02-07 23:38:40 +0800 (Tue, 07 Feb 2012) | 9 lines
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.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
camel/branches/camel-2.8.x/components/camel-http/ (props changed)
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 7 15:45:42 2012
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006
-/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967
+/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489
+/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.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.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java?rev=1241494&r1=1241493&r2=1241494&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java Tue Feb 7 15:45:42 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.8.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.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java?rev=1241494&r1=1241493&r2=1241494&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java Tue Feb 7 15:45:42 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.8.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.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java?rev=1241494&r1=1241493&r2=1241494&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java Tue Feb 7 15:45:42 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);
Propchange: camel/branches/camel-2.8.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 7 15:45:42 2012
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.9.x/components/camel-http:1234054,1241006
+/camel/branches/camel-2.9.x/components/camel-http:1234054,1241006,1241489
/camel/trunk/components/camel-http:1226860,1228223,1234043