Author: davsclaus
Date: Tue Apr 28 05:00:00 2009
New Revision: 769241
URL: http://svn.apache.org/viewvc?rev=769241&view=rev
Log:
Merged revisions 769239 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r769239 | davsclaus | 2009-04-28 06:57:24 +0200 (Tue, 28 Apr 2009) | 1 line
CAMEL-1568: Fixed IOConverter messing with line breaks. Applied patch with
thanks to Christian Ohr.
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 05:00:00 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=769241&r1=769240&r2=769241&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Tue Apr 28 05:00:00 2009
@@ -203,25 +203,6 @@
if (reader == null) {
return null;
}
- try {
- CollectionStringBuffer builder = new CollectionStringBuffer("\n");
- while (true) {
- String line = reader.readLine();
- if (line == null) {
- return builder.toString();
- }
- builder.append(line);
- }
- } finally {
- ObjectHelper.close(reader, "reader", LOG);
- }
- }
-
- @Converter
- public static byte[] toByteArray(BufferedReader reader) throws IOException
{
- if (reader == null) {
- return null;
- }
StringBuilder sb = new StringBuilder(1024);
char[] buf = new char[1024];
@@ -234,7 +215,13 @@
ObjectHelper.close(reader, "reader", LOG);
}
- return sb.toString().getBytes();
+ return sb.toString();
+ }
+
+ @Converter
+ public static byte[] toByteArray(BufferedReader reader) throws IOException
{
+ String s = toString(reader);
+ return s != null ? s.getBytes() : null;
}
@Converter
