You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by wt...@apache.org on 2008/12/01 17:08:45 UTC
svn commit: r722110 -
/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Author: wtam
Date: Mon Dec 1 08:08:45 2008
New Revision: 722110
URL: http://svn.apache.org/viewvc?rev=722110&view=rev
Log:
Fix build error introduced by CAMEL-1134
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=722110&r1=722109&r2=722110&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java Mon Dec 1 08:08:45 2008
@@ -120,6 +120,11 @@
}
@Converter
+ public static InputStream toInputStream(String text) {
+ return toInputStream(text, null);
+ }
+
+ @Converter
public static InputStream toInputStream(String text, Exchange exchange) {
if (exchange != null) {
String charsetName = exchange.getProperty(Exchange.CHARSET_NAME, String.class);
Re: svn commit: r722110 - /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Posted by William Tam <em...@gmail.com>.
Yes, it should. I'll propagate it.
Thanks,
William
On Mon, Dec 1, 2008 at 11:52 AM, Hadrian Zbarcea <hz...@gmail.com> wrote:
> @William, should this be done on the 1.x branch too?
> Hadrian
>
> On Dec 1, 2008, at 11:08 AM, wtam@apache.org wrote:
>
>> Author: wtam
>> Date: Mon Dec 1 08:08:45 2008
>> New Revision: 722110
>>
>> URL: http://svn.apache.org/viewvc?rev=722110&view=rev
>> Log:
>> Fix build error introduced by CAMEL-1134
>>
>> Modified:
>>
>> activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
>>
>> Modified:
>> activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
>> URL:
>> http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=722110&r1=722109&r2=722110&view=diff
>>
>> ==============================================================================
>> ---
>> activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
>> (original)
>> +++
>> activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
>> Mon Dec 1 08:08:45 2008
>> @@ -120,6 +120,11 @@
>> }
>>
>> @Converter
>> + public static InputStream toInputStream(String text) {
>> + return toInputStream(text, null);
>> + }
>> +
>> + @Converter
>> public static InputStream toInputStream(String text, Exchange exchange)
>> {
>> if (exchange != null) {
>> String charsetName =
>> exchange.getProperty(Exchange.CHARSET_NAME, String.class);
>>
>>
>
>
Re: svn commit: r722110 - /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Posted by Jon Anstey <ja...@gmail.com>.
FYI: here are some instructions for merging:
http://activemq.apache.org/camel/merging-commits-from-trunk-to-fixes-branch.html
On Mon, Dec 1, 2008 at 1:22 PM, Hadrian Zbarcea <hz...@gmail.com> wrote:
> @William, should this be done on the 1.x branch too?
> Hadrian
>
>
> On Dec 1, 2008, at 11:08 AM, wtam@apache.org wrote:
>
> Author: wtam
>> Date: Mon Dec 1 08:08:45 2008
>> New Revision: 722110
>>
>> URL: http://svn.apache.org/viewvc?rev=722110&view=rev
>> Log:
>> Fix build error introduced by CAMEL-1134
>>
>> Modified:
>>
>> activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
>>
>> Modified:
>> activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
>> URL:
>> http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=722110&r1=722109&r2=722110&view=diff
>>
>> ==============================================================================
>> ---
>> activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
>> (original)
>> +++
>> activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
>> Mon Dec 1 08:08:45 2008
>> @@ -120,6 +120,11 @@
>> }
>>
>> @Converter
>> + public static InputStream toInputStream(String text) {
>> + return toInputStream(text, null);
>> + }
>> +
>> + @Converter
>> public static InputStream toInputStream(String text, Exchange exchange)
>> {
>> if (exchange != null) {
>> String charsetName =
>> exchange.getProperty(Exchange.CHARSET_NAME, String.class);
>>
>>
>>
>
--
Cheers,
Jon
http://janstey.blogspot.com/
Re: svn commit: r722110 - /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Posted by Hadrian Zbarcea <hz...@gmail.com>.
@William, should this be done on the 1.x branch too?
Hadrian
On Dec 1, 2008, at 11:08 AM, wtam@apache.org wrote:
> Author: wtam
> Date: Mon Dec 1 08:08:45 2008
> New Revision: 722110
>
> URL: http://svn.apache.org/viewvc?rev=722110&view=rev
> Log:
> Fix build error introduced by CAMEL-1134
>
> Modified:
> activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/
> converter/IOConverter.java
>
> Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/
> camel/converter/IOConverter.java
> URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=722110&r1=722109&r2=722110&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/
> converter/IOConverter.java (original)
> +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/
> converter/IOConverter.java Mon Dec 1 08:08:45 2008
> @@ -120,6 +120,11 @@
> }
>
> @Converter
> + public static InputStream toInputStream(String text) {
> + return toInputStream(text, null);
> + }
> +
> + @Converter
> public static InputStream toInputStream(String text, Exchange
> exchange) {
> if (exchange != null) {
> String charsetName =
> exchange.getProperty(Exchange.CHARSET_NAME, String.class);
>
>