svn commit: r735741 - in /activemq/camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/converter/IOConverter.java

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r735741 - in /activemq/camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/converter/IOConverter.java

davsclaus-2
Author: davsclaus
Date: Mon Jan 19 08:08:20 2009
New Revision: 735741

URL: http://svn.apache.org/viewvc?rev=735741&view=rev
Log:
Merged revisions 735732 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk

........
  r735732 | davsclaus | 2009-01-19 16:43:34 +0100 (Mon, 19 Jan 2009) | 1 line
 
  CAMEL-1272: Removed duplicate type converter. We should keep the ones that support Exchange optional parameter.
........

Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 08:08:20 2009
@@ -1 +1 @@
-/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422,734727,734903,734932,735421,735427
+/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422,734727,734903,734932,735421,735427,735732

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=735741&r1=735740&r2=735741&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java Mon Jan 19 08:08:20 2009
@@ -116,11 +116,6 @@
     }
 
     @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);
@@ -136,11 +131,6 @@
     }
     
     @Converter
-    public static InputStream toInputStream(BufferedReader buffer) throws IOException {
-        return toInputStream(toString(buffer), null);
-    }
-
-    @Converter
     public static InputStream toInputStream(BufferedReader buffer, Exchange exchange) throws IOException {
         return toInputStream(toString(buffer), exchange);
     }