You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/04/28 06:57:25 UTC
svn commit: r769239 -
/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Author: davsclaus
Date: Tue Apr 28 04:57:24 2009
New Revision: 769239
URL: http://svn.apache.org/viewvc?rev=769239&view=rev
Log:
CAMEL-1568: Fixed IOConverter messing with line breaks. Applied patch with thanks to Christian Ohr.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=769239&r1=769238&r2=769239&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java Tue Apr 28 04:57:24 2009
@@ -205,25 +205,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];
@@ -236,7 +217,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