camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1365077 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Date Tue, 24 Jul 2012 14:21:29 GMT
Author: ningjiang
Date: Tue Jul 24 14:21:28 2012
New Revision: 1365077

URL: http://svn.apache.org/viewvc?rev=1365077&view=rev
Log:
Merged revisions 1365071 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x

................
  r1365071 | ningjiang | 2012-07-24 22:11:56 +0800 (Tue, 24 Jul 2012) | 9 lines
  
  Merged revisions 1365061 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1365061 | ningjiang | 2012-07-24 21:55:24 +0800 (Tue, 24 Jul 2012) | 1 line
    
    CAMEL-5461 IOConverter.toInputStream should provide close and reset method
  ........
................

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

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1365061
  Merged /camel/branches/camel-2.10.x:r1365071

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

Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=1365077&r1=1365076&r2=1365077&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
(original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Tue Jul 24 14:21:28 2012
@@ -81,6 +81,16 @@ public final class IOConverter {
                 public int read() throws IOException {
                     return reader.read();
                 }
+                
+                @Override
+                public void close() throws IOException {
+                    reader.close();
+                }
+                
+                @Override
+                public void reset() throws IOException {
+                    reader.reset();
+                }
             };
         } else {
             return IOHelper.buffered(new FileInputStream(file));



Mime
View raw message