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 2011/12/22 04:33:49 UTC
svn commit: r1222020 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java
Author: ningjiang
Date: Thu Dec 22 03:33:48 2011
New Revision: 1222020
URL: http://svn.apache.org/viewvc?rev=1222020&view=rev
Log:
Merged revisions 1222006 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1222006 | ningjiang | 2011-12-22 10:37:19 +0800 (Thu, 22 Dec 2011) | 1 line
CAMEL-4813 Added a converter to turn StringBuffer to InputStream
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 03:33:48 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132,1214639,1214743,1215240,1215448,1215482,1220711,1221129,1221566,1221737
+/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132,1214639,1214743,1215240,1215448,1215482,1220711,1221129,1221566,1221737,1222006
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=1222020&r1=1222019&r2=1222020&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java Thu Dec 22 03:33:48 2011
@@ -156,6 +156,11 @@ public final class IOConverter {
return toInputStream(text.getBytes(getCharsetName(exchange)));
}
+ @Converter
+ public static InputStream toInputStream(StringBuffer buffer, Exchange exchange) throws IOException {
+ return toInputStream(buffer.toString(), exchange);
+ }
+
/**
* @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters.
*/
Modified: camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java?rev=1222020&r1=1222019&r2=1222020&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java Thu Dec 22 03:33:48 2011
@@ -101,6 +101,15 @@ public class IOConverterTest extends Con
InputStream is = IOConverter.toInputStream("Hello World", exchange);
assertNotNull(is);
}
+
+ public void testToInputStreamStringBufferExchange() throws Exception {
+ Exchange exchange = new DefaultExchange(context);
+ exchange.setProperty(Exchange.CHARSET_NAME, ObjectHelper.getDefaultCharacterSet());
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("Hello World");
+ InputStream is = IOConverter.toInputStream(buffer, exchange);
+ assertNotNull(is);
+ }
public void testToInputStreamBufferReader() throws Exception {
Exchange exchange = new DefaultExchange(context);